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

Diff of /eclass/eutils.eclass

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

Revision 1.206 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.206 2005/10/07 16:21:48 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
589 einfo " - Extra: $@" 590 einfo " - Extra: $@"
590 pw useradd ${euser} ${opts} \ 591 pw useradd ${euser} ${opts} \
591 "$@" || die "enewuser failed" 592 "$@" || die "enewuser failed"
592 fi 593 fi
593 ;; 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
594 *) 618 *)
595 if [[ -z $@ ]] ; then 619 if [[ -z $@ ]] ; then
596 useradd ${opts} ${euser} \ 620 useradd ${opts} ${euser} \
597 -c "added by portage for ${PN}" \ 621 -c "added by portage for ${PN}" \
598 || die "enewuser failed" 622 || die "enewuser failed"
622# Default values if you do not specify any: 646# Default values if you do not specify any:
623# groupname: REQUIRED ! 647# groupname: REQUIRED !
624# gid: next available (see groupadd(8)) 648# gid: next available (see groupadd(8))
625# extra: none 649# extra: none
626enewgroup() { 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
627 # get the group 658 # get the group
628 local egroup="$1"; shift 659 local egroup="$1"; shift
629 if [ -z "${egroup}" ] 660 if [ -z "${egroup}" ]
630 then 661 then
631 eerror "No group specified !" 662 eerror "No group specified !"
632 die "Cannot call enewgroup without a group" 663 die "Cannot call enewgroup without a group"
633 fi 664 fi
634 665
635 # see if group already exists 666 # see if group already exists
636 if [ "${egroup}" == "`egetent group \"${egroup}\" | cut -d: -f1`" ] 667 if [[ -n $(egetent group "${egroup}") ]]; then
637 then
638 return 0 668 return 0
639 fi 669 fi
640 einfo "Adding group '${egroup}' to your system ..." 670 einfo "Adding group '${egroup}' to your system ..."
641 671
642 # options to pass to useradd 672 # options to pass to useradd
685 fi 715 fi
686 716
687 # If we need the next available 717 # If we need the next available
688 case ${egid} in 718 case ${egid} in
689 *[!0-9]*) # Non numeric 719 *[!0-9]*) # Non numeric
690 for egid in $(seq 101 999); do 720 for ((egid = 101; egid <= 999; egid++)); do
691 [ -z "`egetent group ${egid}`" ] && break 721 [[ -z $(egetent group ${egid}) ]] && break
692 done 722 done
693 esac 723 esac
694 dscl . create /groups/${egroup} gid ${egid} 724 dscl . create /groups/${egroup} gid ${egid}
695 dscl . create /groups/${egroup} passwd '*' 725 dscl . create /groups/${egroup} passwd '*'
696 ;; 726 ;;
697 727
698 *-freebsd*) 728 *-freebsd*|*-dragonfly*)
699 case ${egid} in 729 case ${egid} in
700 *[!0-9]*) # Non numeric 730 *[!0-9]*) # Non numeric
701 for egid in $(seq 101 999); do 731 for ((egid = 101; egid <= 999; egid++)); do
702 [ -z "`egetent group ${egid}`" ] && break 732 [[ -z $(egetent group ${egid}) ]] && break
703 done 733 done
704 esac 734 esac
705 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 735 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
706 ;; 736 ;;
707 737
708 *-netbsd*) 738 *-netbsd*)
709 case ${egid} in 739 case ${egid} in
710 *[!0-9]*) # Non numeric 740 *[!0-9]*) # Non numeric
711 for egid in $(seq 101 999); do 741 for ((egid = 101; egid <= 999; egid++)); do
712 [ -z "`egetent group ${egid}`" ] && break 742 [[ -z $(egetent group ${egid}) ]] && break
713 done 743 done
714 esac 744 esac
715 groupadd ${egroup} -g ${egid} || die "enewgroup failed" 745 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
716 ;; 746 ;;
717 747
718 *) 748 *)
719 groupadd ${opts} ${egroup} || die "enewgroup failed" 749 groupadd ${opts} ${egroup} || die "enewgroup failed"
720 ;; 750 ;;
725# Simple script to replace 'dos2unix' binaries 755# Simple script to replace 'dos2unix' binaries
726# vapier@gentoo.org 756# vapier@gentoo.org
727# 757#
728# edos2unix(file, <more files> ...) 758# edos2unix(file, <more files> ...)
729edos2unix() { 759edos2unix() {
730 for f in "$@" 760 echo "$@" | xargs sed -i 's/\r$//'
731 do
732 cp "${f}" ${T}/edos2unix
733 sed 's/\r$//' ${T}/edos2unix > "${f}"
734 done
735} 761}
736 762
737 763
738############################################################## 764##############################################################
739# START: Handle .desktop files and menu entries # 765# START: Handle .desktop files and menu entries #
740# maybe this should be separated into a new eclass some time # 766# maybe this should be separated into a new eclass some time #
741# lanius@gentoo.org # 767# lanius@gentoo.org #
742############################################################## 768##############################################################
743 769
744# Make a desktop file ! 770# Make a desktop file !
745# Great for making those icons in kde/gnome startmenu ! 771# Great for making those icons in kde/gnome startmenu !
746# Amaze your friends ! Get the women ! Join today ! 772# Amaze your friends ! Get the women ! Join today !
747# 773#
748# make_desktop_entry(<binary>, [name], [icon], [type], [path]) 774# make_desktop_entry(<command>, [name], [icon], [type], [path])
749# 775#
750# binary: what binary does the app run with ? 776# binary: what command does the app run with ?
751# name: the name that will show up in the menu 777# name: the name that will show up in the menu
752# icon: give your little like a pretty little icon ... 778# icon: give your little like a pretty little icon ...
753# this can be relative (to /usr/share/pixmaps) or 779# this can be relative (to /usr/share/pixmaps) or
754# a full path to an icon 780# a full path to an icon
755# type: what kind of application is this ? for categories: 781# type: what kind of application is this ? for categories:
756# http://www.freedesktop.org/Standards/desktop-entry-spec 782# http://www.freedesktop.org/Standards/desktop-entry-spec
757# path: if your app needs to startup in a specific dir 783# path: if your app needs to startup in a specific dir
758make_desktop_entry() { 784make_desktop_entry() {
759 [[ -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
760 786
768 local catmaj=${CATEGORY%%-*} 794 local catmaj=${CATEGORY%%-*}
769 local catmin=${CATEGORY##*-} 795 local catmin=${CATEGORY##*-}
770 case ${catmaj} in 796 case ${catmaj} in
771 app) 797 app)
772 case ${catmin} in 798 case ${catmin} in
773 admin) type=System;; 799 admin) type=System;;
774 cdr) type=DiscBurning;; 800 cdr) type=DiscBurning;;
775 dicts) type=Dictionary;; 801 dicts) type=Dictionary;;
776 editors) type=TextEditor;; 802 editors) type=TextEditor;;
777 emacs) type=TextEditor;; 803 emacs) type=TextEditor;;
778 emulation) type=Emulator;; 804 emulation) type=Emulator;;
779 laptop) type=HardwareSettings;; 805 laptop) type=HardwareSettings;;
780 office) type=Office;; 806 office) type=Office;;
781 vim) type=TextEditor;; 807 vim) type=TextEditor;;
782 xemacs) type=TextEditor;; 808 xemacs) type=TextEditor;;
783 *) type=;; 809 *) type=;;
784 esac 810 esac
785 ;; 811 ;;
786 812
787 dev) 813 dev)
788 type="Development" 814 type="Development"
789 ;; 815 ;;
790 816
791 games) 817 games)
792 case ${catmin} in 818 case ${catmin} in
793 action) type=ActionGame;; 819 action|fps) type=ActionGame;;
794 arcade) type=ArcadeGame;; 820 arcade) type=ArcadeGame;;
795 board) type=BoardGame;; 821 board) type=BoardGame;;
796 kid) type=KidsGame;; 822 kids) type=KidsGame;;
797 emulation) type=Emulator;; 823 emulation) type=Emulator;;
798 puzzle) type=LogicGame;; 824 puzzle) type=LogicGame;;
799 rpg) type=RolePlaying;; 825 rpg) type=RolePlaying;;
800 roguelike) type=RolePlaying;; 826 roguelike) type=RolePlaying;;
801 simulation) type=Simulation;; 827 simulation) type=Simulation;;
802 sports) type=SportsGame;; 828 sports) type=SportsGame;;
803 strategy) type=StrategyGame;; 829 strategy) type=StrategyGame;;
804 *) type=;; 830 *) type=;;
805 esac 831 esac
806 type="Game;${type}" 832 type="Game;${type}"
807 ;; 833 ;;
808 834
809 mail) 835 mail)
813 media) 839 media)
814 case ${catmin} in 840 case ${catmin} in
815 gfx) type=Graphics;; 841 gfx) type=Graphics;;
816 radio) type=Tuner;; 842 radio) type=Tuner;;
817 sound) type=Audio;; 843 sound) type=Audio;;
818 tv) type=TV;; 844 tv) type=TV;;
819 video) type=Video;; 845 video) type=Video;;
820 *) type=;; 846 *) type=;;
821 esac 847 esac
822 type="AudioVideo;${type}" 848 type="AudioVideo;${type}"
823 ;; 849 ;;
824 850
825 net) 851 net)
826 case ${catmin} in 852 case ${catmin} in
827 dialup) type=Dialup;; 853 dialup) type=Dialup;;
828 ftp) type=FileTransfer;; 854 ftp) type=FileTransfer;;
829 im) type=InstantMessaging;; 855 im) type=InstantMessaging;;
830 irc) type=IRCClient;; 856 irc) type=IRCClient;;
831 mail) type=Email;; 857 mail) type=Email;;
832 news) type=News;; 858 news) type=News;;
833 nntp) type=News;; 859 nntp) type=News;;
834 p2p) type=FileTransfer;; 860 p2p) type=FileTransfer;;
835 *) type=;; 861 *) type=;;
836 esac 862 esac
837 type="Network;${type}" 863 type="Network;${type}"
838 ;; 864 ;;
839 865
840 sci) 866 sci)
841 case ${catmin} in 867 case ${catmin} in
842 astro*) type=Astronomoy;; 868 astro*) type=Astronomy;;
843 bio*) type=Biology;; 869 bio*) type=Biology;;
844 calc*) type=Calculator;; 870 calc*) type=Calculator;;
845 chem*) type=Chemistry;; 871 chem*) type=Chemistry;;
846 geo*) type=Geology;; 872 geo*) type=Geology;;
847 math*) type=Math;; 873 math*) type=Math;;
848 *) type=;; 874 *) type=;;
849 esac 875 esac
850 type="Science;${type}" 876 type="Science;${type}"
851 ;; 877 ;;
852 878
853 www) 879 www)
854 case ${catmin} in 880 case ${catmin} in
855 client) type=WebBrowser;; 881 client) type=WebBrowser;;
856 *) type=;; 882 *) type=;;
857 esac 883 esac
858 type="Network" 884 type="Network"
859 ;; 885 ;;
860 886
861 *) 887 *)
866 if [ "${SLOT}" == "0" ] ; then 892 if [ "${SLOT}" == "0" ] ; then
867 local desktop_name="${PN}" 893 local desktop_name="${PN}"
868 else 894 else
869 local desktop_name="${PN}-${SLOT}" 895 local desktop_name="${PN}-${SLOT}"
870 fi 896 fi
897 local desktop="${T}/$(echo ${exec} | sed 's:[[:space:]/:]:_:g')-${desktop_name}.desktop"
871 local desktop=${T}/${exec%% *}-${desktop_name}.desktop 898 #local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
872 899
900 cat <<-EOF > "${desktop}"
873echo "[Desktop Entry] 901 [Desktop Entry]
874Encoding=UTF-8 902 Encoding=UTF-8
875Version=0.9.2 903 Version=0.9.2
876Name=${name} 904 Name=${name}
877Type=Application 905 Type=Application
878Comment=${DESCRIPTION} 906 Comment=${DESCRIPTION}
879Exec=${exec} 907 Exec=${exec}
908 TryExec=${exec%% *}
880Path=${path} 909 Path=${path}
881Icon=${icon} 910 Icon=${icon}
882Categories=Application;${type};" > "${desktop}" 911 Categories=Application;${type};
912 EOF
883 913
884 ( 914 (
885 # wrap the env here so that the 'insinto' call 915 # wrap the env here so that the 'insinto' call
886 # doesn't corrupt the env of the caller 916 # doesn't corrupt the env of the caller
887 insinto /usr/share/applications 917 insinto /usr/share/applications
888 doins "${desktop}" 918 doins "${desktop}"
889 ) 919 )
890} 920}
891 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
892# Make a GDM/KDM Session file 951# Make a GDM/KDM Session file
893# 952#
894# make_desktop_entry(<title>, <command>) 953# make_session_desktop(<title>, <command>)
895# title: File to execute to start the Window Manager 954# title: File to execute to start the Window Manager
896# command: Name of the Window Manager 955# command: Name of the Window Manager
897 956
898make_session_desktop() { 957make_session_desktop() {
899 [[ -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
901 960
902 local title=$1 961 local title=$1
903 local command=$2 962 local command=$2
904 local desktop=${T}/${wm}.desktop 963 local desktop=${T}/${wm}.desktop
905 964
965 cat <<-EOF > "${desktop}"
906echo "[Desktop Entry] 966 [Desktop Entry]
907Encoding=UTF-8 967 Encoding=UTF-8
908Name=${title} 968 Name=${title}
909Comment=This session logs you into ${title} 969 Comment=This session logs you into ${title}
910Exec=${command} 970 Exec=${command}
911TryExec=${command} 971 TryExec=${command}
912Type=Application" > "${desktop}" 972 Type=Application
973 EOF
913 974
975 (
976 # wrap the env here so that the 'insinto' call
977 # doesn't corrupt the env of the caller
914 insinto /usr/share/xsessions 978 insinto /usr/share/xsessions
915 doins "${desktop}" 979 doins "${desktop}"
980 )
916} 981}
917 982
918domenu() { 983domenu() {
984 (
985 # wrap the env here so that the 'insinto' call
986 # doesn't corrupt the env of the caller
919 local i j 987 local i j ret=0
920 insinto /usr/share/applications 988 insinto /usr/share/applications
921 for i in "$@" ; do 989 for i in "$@" ; do
922 if [[ -f ${i} ]] ; then 990 if [[ -f ${i} ]] ; then
923 doins "${i}" 991 doins "${i}"
992 ((ret+=$?))
924 elif [[ -d ${i} ]] ; then 993 elif [[ -d ${i} ]] ; then
925 for j in "${i}"/*.desktop ; do 994 for j in "${i}"/*.desktop ; do
926 doins "${j}" 995 doins "${j}"
996 ((ret+=$?))
927 done 997 done
928 fi 998 fi
929 done 999 done
1000 exit ${ret}
1001 )
930} 1002}
931newmenu() { 1003newmenu() {
1004 (
1005 # wrap the env here so that the 'insinto' call
1006 # doesn't corrupt the env of the caller
932 insinto /usr/share/applications 1007 insinto /usr/share/applications
933 newins "$1" "$2" 1008 newins "$@"
1009 )
934} 1010}
935 1011
936doicon() { 1012doicon() {
1013 (
1014 # wrap the env here so that the 'insinto' call
1015 # doesn't corrupt the env of the caller
937 local i j 1016 local i j ret
938 insinto /usr/share/pixmaps 1017 insinto /usr/share/pixmaps
939 for i in "$@" ; do 1018 for i in "$@" ; do
940 if [[ -f ${i} ]] ; then 1019 if [[ -f ${i} ]] ; then
941 doins "${i}" 1020 doins "${i}"
1021 ((ret+=$?))
942 elif [[ -d ${i} ]] ; then 1022 elif [[ -d ${i} ]] ; then
943 for j in "${i}"/*.png ; do 1023 for j in "${i}"/*.png ; do
944 doins "${j}" 1024 doins "${j}"
1025 ((ret+=$?))
945 done 1026 done
946 fi 1027 fi
947 done 1028 done
1029 exit ${ret}
1030 )
948} 1031}
949newicon() { 1032newicon() {
1033 (
1034 # wrap the env here so that the 'insinto' call
1035 # doesn't corrupt the env of the caller
950 insinto /usr/share/pixmaps 1036 insinto /usr/share/pixmaps
951 newins "$1" "$2" 1037 newins "$@"
1038 )
952} 1039}
953 1040
954############################################################## 1041##############################################################
955# END: Handle .desktop files and menu entries # 1042# END: Handle .desktop files and menu entries #
956############################################################## 1043##############################################################
957 1044
958 1045
959# for internal use only (unpack_pdv and unpack_makeself) 1046# for internal use only (unpack_pdv and unpack_makeself)
960find_unpackable_file() { 1047find_unpackable_file() {
979# 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
980# 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.
981# 1068#
982# Usage: unpack_pdv [file to unpack] [size of off_t] 1069# Usage: unpack_pdv [file to unpack] [size of off_t]
983# - 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
984# information out of the binary executable myself. basically you pass in 1071# information out of the binary executable myself. basically you pass in
985# 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
986# 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:
987# strings <pdv archive> | grep lseek 1074# strings <pdv archive> | grep lseek
988# strace -elseek <pdv archive> 1075# strace -elseek <pdv archive>
989# 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
990# 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
991# parameter. here is an example: 1078# parameter. here is an example:
992# root@vapier 0 pdv_unpack # strings hldsupdatetool.bin | grep lseek 1079# root@vapier 0 pdv_unpack # strings hldsupdatetool.bin | grep lseek
993# lseek 1080# lseek
994# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1081# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
995# lseek(3, -4, SEEK_END) = 2981250 1082# lseek(3, -4, SEEK_END) = 2981250
996# 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.
997unpack_pdv() { 1084unpack_pdv() {
998 local src=$(find_unpackable_file $1) 1085 local src=$(find_unpackable_file "$1")
999 local sizeoff_t=$2 1086 local sizeoff_t=$2
1000 1087
1001 [[ -z ${src} ]] && die "Could not locate source for '$1'" 1088 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1002 [[ -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 :("
1003 1090
1004 local shrtsrc="`basename ${src}`" 1091 local shrtsrc=$(basename "${src}")
1005 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1092 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1006 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1093 local metaskip=$(tail -c ${sizeoff_t} "${src}" | hexdump -e \"%i\")
1007 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\")
1008 1095
1009 # grab metadata for debug reasons 1096 # grab metadata for debug reasons
1010 local metafile="$(emktemp)" 1097 local metafile=$(emktemp)
1011 tail -c +$((${metaskip}+1)) ${src} > ${metafile} 1098 tail -c +$((${metaskip}+1)) "${src}" > "${metafile}"
1012 1099
1013 # rip out the final file name from the metadata 1100 # rip out the final file name from the metadata
1014 local datafile="`tail -c +$((${metaskip}+1)) ${src} | strings | head -n 1`" 1101 local datafile=$(tail -c +$((${metaskip}+1)) "${src}" | strings | head -n 1)
1015 datafile="`basename ${datafile}`" 1102 datafile=$(basename "${datafile}")
1016 1103
1017 # now lets uncompress/untar the file if need be 1104 # now lets uncompress/untar the file if need be
1018 local tmpfile="$(emktemp)" 1105 local tmpfile=$(emktemp)
1019 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}
1020 1107
1021 local iscompressed="`file -b ${tmpfile}`" 1108 local iscompressed=$(file -b "${tmpfile}")
1022 if [ "${iscompressed:0:8}" == "compress" ] ; then 1109 if [[ ${iscompressed:0:8} == "compress" ]] ; then
1023 iscompressed=1 1110 iscompressed=1
1024 mv ${tmpfile}{,.Z} 1111 mv ${tmpfile}{,.Z}
1025 gunzip ${tmpfile} 1112 gunzip ${tmpfile}
1026 else 1113 else
1027 iscompressed=0 1114 iscompressed=0
1028 fi 1115 fi
1029 local istar="`file -b ${tmpfile}`" 1116 local istar=$(file -b "${tmpfile}")
1030 if [ "${istar:0:9}" == "POSIX tar" ] ; then 1117 if [[ ${istar:0:9} == "POSIX tar" ]] ; then
1031 istar=1 1118 istar=1
1032 else 1119 else
1033 istar=0 1120 istar=0
1034 fi 1121 fi
1035 1122
1071# many other game companies. 1158# many other game companies.
1072# 1159#
1073# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1160# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1074# - If the file is not specified then unpack will utilize ${A}. 1161# - If the file is not specified then unpack will utilize ${A}.
1075# - 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
1076# the proper offset from the script itself. 1163# the proper offset from the script itself.
1077unpack_makeself() { 1164unpack_makeself() {
1165 local src_input=${1:-${A}}
1078 local src=$(find_unpackable_file "$1") 1166 local src=$(find_unpackable_file "${src_input}")
1079 local skip=$2 1167 local skip=$2
1080 local exe=$3 1168 local exe=$3
1081 1169
1082 [[ -z ${src} ]] && die "Could not locate source for '$1'" 1170 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1083 1171
1084 local shrtsrc=$(basename "${src}") 1172 local shrtsrc=$(basename "${src}")
1085 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1173 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1086 if [ -z "${skip}" ] 1174 if [[ -z ${skip} ]] ; then
1087 then
1088 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1175 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1089 local skip=0 1176 local skip=0
1090 exe=tail 1177 exe=tail
1091 case ${ver} in 1178 case ${ver} in
1092 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
1093 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1180 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1094 ;; 1181 ;;
1095 2.0|2.0.1) 1182 2.0|2.0.1)
1096 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-) 1183 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-)
1097 ;; 1184 ;;
1105 ;; 1192 ;;
1106 2.1.3) 1193 2.1.3)
1107 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1194 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1108 let skip="skip + 1" 1195 let skip="skip + 1"
1109 ;; 1196 ;;
1110 2.1.4) 1197 2.1.4|2.1.5)
1111 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)
1112 skip=$(head -n ${skip} "${src}" | wc -c) 1199 skip=$(head -n ${skip} "${src}" | wc -c)
1113 exe="dd" 1200 exe="dd"
1114 ;; 1201 ;;
1115 *) 1202 *)
1127 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}'";;
1128 *) die "makeself cant handle exe '${exe}'" 1215 *) die "makeself cant handle exe '${exe}'"
1129 esac 1216 esac
1130 1217
1131 # 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
1132 local tmpfile="$(emktemp)" 1219 local tmpfile=$(emktemp)
1133 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}" 1220 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}"
1134 local filetype="$(file -b "${tmpfile}")" 1221 local filetype=$(file -b "${tmpfile}")
1135 case ${filetype} in 1222 case ${filetype} in
1136 *tar\ archive) 1223 *tar\ archive*)
1137 eval ${exe} | tar --no-same-owner -xf - 1224 eval ${exe} | tar --no-same-owner -xf -
1138 ;; 1225 ;;
1139 bzip2*) 1226 bzip2*)
1140 eval ${exe} | bzip2 -dc | tar --no-same-owner -xf - 1227 eval ${exe} | bzip2 -dc | tar --no-same-owner -xf -
1141 ;; 1228 ;;
1177 # 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
1178 local shopts=$- 1265 local shopts=$-
1179 local alic 1266 local alic
1180 set -o noglob #so that bash doesn't expand "*" 1267 set -o noglob #so that bash doesn't expand "*"
1181 for alic in ${ACCEPT_LICENSE} ; do 1268 for alic in ${ACCEPT_LICENSE} ; do
1182 if [[ ${alic} == * || ${alic} == ${l} ]]; then 1269 if [[ ${alic} == ${l} ]]; then
1183 set +o noglob; set -${shopts} #reset old shell opts 1270 set +o noglob; set -${shopts} #reset old shell opts
1184 return 0 1271 return 0
1185 fi 1272 fi
1186 done 1273 done
1187 set +o noglob; set -$shopts #reset old shell opts 1274 set +o noglob; set -$shopts #reset old shell opts
1188 1275
1189 local licmsg="$(emktemp)" 1276 local licmsg=$(emktemp)
1190 cat << EOF > ${licmsg} 1277 cat <<-EOF > ${licmsg}
1191********************************************************** 1278 **********************************************************
1192The following license outlines the terms of use of this 1279 The following license outlines the terms of use of this
1193package. You MUST accept this license for installation to 1280 package. You MUST accept this license for installation to
1194continue. When you are done viewing, hit 'q'. If you 1281 continue. When you are done viewing, hit 'q'. If you
1195CTRL+C out of this, the install will not run! 1282 CTRL+C out of this, the install will not run!
1196********************************************************** 1283 **********************************************************
1197 1284
1198EOF 1285 EOF
1199 cat ${lic} >> ${licmsg} 1286 cat ${lic} >> ${licmsg}
1200 ${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}"
1201 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] "
1202 read alic 1289 read alic
1203 case ${alic} in 1290 case ${alic} in
1220# 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
1221# found at CDROM_ROOT. 1308# found at CDROM_ROOT.
1222# 1309#
1223# 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',
1224# 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
1225# 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_#
1226# 1317#
1227# 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.
1228# 1319#
1229# 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] [...]
1230# - 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
1231# 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
1232# the cdrom functions will handle 1323# the cdrom functions will handle
1233cdrom_get_cds() { 1324cdrom_get_cds() {
1234 # 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
1235 # the # of files they gave us 1326 # the # of files they gave us
1236 local cdcnt=0 1327 local cdcnt=0
1237 local f= 1328 local f=
1238 for f in "$@" ; do 1329 for f in "$@" ; do
1239 cdcnt=$((cdcnt + 1)) 1330 ((++cdcnt))
1240 export CDROM_CHECK_${cdcnt}="$f" 1331 export CDROM_CHECK_${cdcnt}="$f"
1241 done 1332 done
1242 export CDROM_TOTAL_CDS=${cdcnt} 1333 export CDROM_TOTAL_CDS=${cdcnt}
1243 export CDROM_CURRENT_CD=1 1334 export CDROM_CURRENT_CD=1
1244 1335
1245 # now we see if the user gave use CD_ROOT ... 1336 # now we see if the user gave use CD_ROOT ...
1246 # 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
1247 if [[ ! -z ${CD_ROOT} ]] ; then
1248 export CDROM_ROOT=${CD_ROOT}
1249 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1250 return
1251 fi
1252 # do the same for CD_ROOT_X
1253 if [[ ! -z ${CD_ROOT_1} ]] ; then 1338 if [[ -n ${CD_ROOT}${CD_ROOT_1} ]] ; then
1254 local var= 1339 local var=
1255 cdcnt=0 1340 cdcnt=0
1256 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1341 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1257 cdcnt=$((cdcnt + 1)) 1342 ((++cdcnt))
1258 var="CD_ROOT_${cdcnt}" 1343 var="CD_ROOT_${cdcnt}"
1344 [[ -z ${!var} ]] && var="CD_ROOT"
1259 if [[ -z ${!var} ]] ; then 1345 if [[ -z ${!var} ]] ; then
1260 eerror "You must either use just the CD_ROOT" 1346 eerror "You must either use just the CD_ROOT"
1261 eerror "or specify ALL the CD_ROOT_X variables." 1347 eerror "or specify ALL the CD_ROOT_X variables."
1262 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."
1263 die "could not locate CD_ROOT_${cdcnt}" 1349 die "could not locate CD_ROOT_${cdcnt}"
1264 fi 1350 fi
1265 export CDROM_ROOTS_${cdcnt}="${!var}"
1266 done 1351 done
1267 export CDROM_ROOT=${CDROM_ROOTS_1} 1352 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1268 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}
1269 return 1360 return
1270 fi 1361 fi
1271 1362
1363 # User didn't help us out so lets make sure they know they can
1364 # simplify the whole process ...
1272 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1365 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1273 einfon "This ebuild will need the " 1366 einfo "This ebuild will need the ${CDROM_NAME:-cdrom for ${PN}}"
1274 if [[ -z ${CDROM_NAME} ]] ; then
1275 echo "cdrom for ${PN}."
1276 else
1277 echo "${CDROM_NAME}."
1278 fi
1279 echo 1367 echo
1280 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"
1281 einfo "mounted somewhere on your filesystem, just export" 1369 einfo "mounted somewhere on your filesystem, just export"
1282 einfo "the variable CD_ROOT so that it points to the" 1370 einfo "the variable CD_ROOT so that it points to the"
1283 einfo "directory containing the files." 1371 einfo "directory containing the files."
1284 echo 1372 echo
1285 einfo "For example:" 1373 einfo "For example:"
1286 einfo "export CD_ROOT=/mnt/cdrom" 1374 einfo "export CD_ROOT=/mnt/cdrom"
1287 echo 1375 echo
1288 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
1289 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1386 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1290 cdcnt=0 1387 cdcnt=0
1291 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1388 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1292 cdcnt=$((cdcnt + 1)) 1389 ((++cdcnt))
1293 var="CDROM_NAME_${cdcnt}" 1390 var="CDROM_NAME_${cdcnt}"
1294 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}" 1391 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1295 done 1392 done
1296 echo 1393 echo
1297 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"
1298 einfo "mounted somewhere on your filesystem, just export" 1395 einfo "mounted somewhere on your filesystem, just export"
1299 einfo "the following variables so they point to the right place:" 1396 einfo "the following variables so they point to the right place:"
1300 einfon "" 1397 einfon ""
1301 cdcnt=0 1398 cdcnt=0
1302 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1399 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1303 cdcnt=$((cdcnt + 1)) 1400 ((++cdcnt))
1304 echo -n " CD_ROOT_${cdcnt}" 1401 echo -n " CD_ROOT_${cdcnt}"
1305 done 1402 done
1306 echo 1403 echo
1307 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"
1308 einfo "you only have one cdrom, you can export CD_ROOT" 1405 einfo "you only have one cdrom, you can export CD_ROOT"
1311 echo 1408 echo
1312 einfo "For example:" 1409 einfo "For example:"
1313 einfo "export CD_ROOT_1=/mnt/cdrom" 1410 einfo "export CD_ROOT_1=/mnt/cdrom"
1314 echo 1411 echo
1315 fi 1412 fi
1413
1414 export CDROM_SET=""
1316 export CDROM_CURRENT_CD=0 1415 export CDROM_CURRENT_CD=0
1317 cdrom_load_next_cd 1416 cdrom_load_next_cd
1318} 1417}
1319 1418
1320# 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.
1321# 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.
1322# 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.
1323# 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.
1324cdrom_load_next_cd() { 1423cdrom_load_next_cd() {
1325 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1326 local var= 1424 local var
1327 1425 ((++CDROM_CURRENT_CD))
1328 if [[ ! -z ${CD_ROOT} ]] ; then
1329 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1330 return
1331 fi
1332 1426
1333 unset CDROM_ROOT 1427 unset CDROM_ROOT
1334 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1428 var=CD_ROOT_${CDROM_CURRENT_CD}
1429 [[ -z ${!var} ]] && var="CD_ROOT"
1335 if [[ -z ${!var} ]] ; then 1430 if [[ -z ${!var} ]] ; then
1336 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1431 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1337 cdrom_locate_file_on_cd ${!var} 1432 _cdrom_locate_file_on_cd ${!var}
1338 else 1433 else
1339 export CDROM_ROOT=${!var} 1434 export CDROM_ROOT=${!var}
1340 fi 1435 fi
1341 1436
1342 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1437 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1347# 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
1348# 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
1349# displayed and we'll hang out here until: 1444# displayed and we'll hang out here until:
1350# (1) the file is found on a mounted cdrom 1445# (1) the file is found on a mounted cdrom
1351# (2) the user hits CTRL+C 1446# (2) the user hits CTRL+C
1352cdrom_locate_file_on_cd() { 1447_cdrom_locate_file_on_cd() {
1448 local mline=""
1449 local showedmsg=0
1450
1353 while [[ -z ${CDROM_ROOT} ]] ; do 1451 while [[ -z ${CDROM_ROOT} ]] ; do
1354 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}]})
1355 local file=$(basename "$*") 1460 local file=$(basename ${cdset[${i}]})
1356 local mline=""
1357 local showedmsg=0
1358 1461
1359 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1462 local point= node= fs= foo=
1360 [[ -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/ }
1361 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \ 1468 [[ -z $(find "${point}/${dir}" -maxdepth 1 -iname "${file}") ]] && continue
1362 && 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))
1363 done 1476 done
1364 1477
1365 if [[ -z ${CDROM_ROOT} ]] ; then
1366 echo 1478 echo
1367 if [[ ${showedmsg} -eq 0 ]] ; then 1479 if [[ ${showedmsg} -eq 0 ]] ; then
1368 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1480 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1369 if [[ -z ${CDROM_NAME} ]] ; then 1481 if [[ -z ${CDROM_NAME} ]] ; then
1370 einfo "Please insert the cdrom for ${PN} now !" 1482 einfo "Please insert+mount the cdrom for ${PN} now !"
1371 else
1372 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1373 fi
1374 else 1483 else
1375 if [[ -z ${CDROM_NAME_1} ]] ; then
1376 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1377 else
1378 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1379 einfo "Please insert+mount the ${!var} cdrom now !" 1484 einfo "Please insert+mount the ${CDROM_NAME} cdrom now !"
1380 fi
1381 fi 1485 fi
1382 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
1383 fi 1493 fi
1494 showedmsg=1
1495 fi
1384 einfo "Press return to scan for the cd again" 1496 einfo "Press return to scan for the cd again"
1385 einfo "or hit CTRL+C to abort the emerge." 1497 einfo "or hit CTRL+C to abort the emerge."
1386 echo 1498 echo
1387 einfo "If you are having trouble with the detection" 1499 einfo "If you are having trouble with the detection"
1388 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"
1389 einfo "Joliet support enabled in your kernel. Please" 1501 einfo "Joliet support enabled in your kernel. Please"
1390 einfo "check that CONFIG_JOLIET is enabled in your kernel." 1502 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1391 read 1503 read || die "something is screwed with your system"
1392 fi
1393 done 1504 done
1394} 1505}
1395 1506
1396# Make sure that LINGUAS only contains languages that 1507# Make sure that LINGUAS only contains languages that
1397# a package can support 1508# a package can support
1398# 1509#
1399# usage: strip-linguas <allow LINGUAS> 1510# usage: strip-linguas <allow LINGUAS>
1400# strip-linguas -i <directories of .po files> 1511# strip-linguas -i <directories of .po files>
1401# strip-linguas -u <directories of .po files> 1512# strip-linguas -u <directories of .po files>
1402# 1513#
1403# The first form allows you to specify a list of LINGUAS. 1514# The first form allows you to specify a list of LINGUAS.
1404# 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
1405# directories and uses the intersection of the lists. 1516# directories and uses the intersection of the lists.
1406# 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
1407# directories and uses the union of the lists. 1518# directories and uses the union of the lists.
1408strip-linguas() { 1519strip-linguas() {
1409 local ls newls 1520 local ls newls nols
1410 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then 1521 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1411 local op=$1; shift 1522 local op=$1; shift
1412 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1523 ls=$(find "$1" -name '*.po' -exec basename {} .po \;); shift
1413 local d f 1524 local d f
1414 for d in "$@" ; do 1525 for d in "$@" ; do
1415 if [[ ${op} == "-u" ]] ; then 1526 if [[ ${op} == "-u" ]] ; then
1416 newls=${ls} 1527 newls=${ls}
1417 else 1528 else
1418 newls="" 1529 newls=""
1419 fi 1530 fi
1420 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1531 for f in $(find "$d" -name '*.po' -exec basename {} .po \;) ; do
1421 if [[ ${op} == "-i" ]] ; then 1532 if [[ ${op} == "-i" ]] ; then
1422 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}" 1533 hasq ${f} ${ls} && newls="${newls} ${f}"
1423 else 1534 else
1424 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}" 1535 hasq ${f} ${ls} || newls="${newls} ${f}"
1425 fi 1536 fi
1426 done 1537 done
1427 ls=${newls} 1538 ls=${newls}
1428 done 1539 done
1429 ls=${ls//.po}
1430 else 1540 else
1431 ls=$@ 1541 ls="$@"
1432 fi 1542 fi
1433 1543
1434 ls=" ${ls} " 1544 nols=""
1435 newls="" 1545 newls=""
1436 for f in ${LINGUAS} ; do 1546 for f in ${LINGUAS} ; do
1437 if [[ ${ls/ ${f} /} != ${ls} ]] ; then 1547 if hasq ${f} ${ls} ; then
1438 newls="${newls} ${f}" 1548 newls="${newls} ${f}"
1439 else 1549 else
1440 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1550 nols="${nols} ${f}"
1441 fi 1551 fi
1442 done 1552 done
1443 if [[ -z ${newls} ]] ; then 1553 [[ -n ${nols} ]] \
1444 export LINGUAS="" 1554 && ewarn "Sorry, but ${PN} does not support the LINGUAs:" ${nols}
1445 else
1446 export LINGUAS=${newls:1} 1555 export LINGUAS=${newls:1}
1447 fi
1448} 1556}
1449 1557
1450# moved from kernel.eclass since they are generally useful outside of 1558# moved from kernel.eclass since they are generally useful outside of
1451# kernel.eclass -iggy (20041002) 1559# kernel.eclass -iggy (20041002)
1452 1560
1459 while ((i--)) ; do 1567 while ((i--)) ; do
1460 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass" 1568 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1461 done 1569 done
1462 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1570 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1463 case ${ARCH} in 1571 case ${ARCH} in
1464 x86) export ARCH="i386";; 1572 x86) export ARCH="i386";;
1465 amd64) export ARCH="x86_64";; 1573 amd64) export ARCH="x86_64";;
1466 hppa) export ARCH="parisc";; 1574 hppa) export ARCH="parisc";;
1467 mips) export ARCH="mips";; 1575 mips) export ARCH="mips";;
1468 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!
1469 *) export ARCH="${ARCH}";; 1577 *) export ARCH="${ARCH}";;
1470 esac 1578 esac
1471} 1579}
1472 1580
1473# set's ARCH back to what portage expects 1581# set's ARCH back to what portage expects
1474set_arch_to_portage() { 1582set_arch_to_portage() {
1481 1589
1482# Jeremy Huddleston <eradicator@gentoo.org>: 1590# Jeremy Huddleston <eradicator@gentoo.org>:
1483# preserve_old_lib /path/to/libblah.so.0 1591# preserve_old_lib /path/to/libblah.so.0
1484# preserve_old_lib_notify /path/to/libblah.so.0 1592# preserve_old_lib_notify /path/to/libblah.so.0
1485# 1593#
1486# 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
1487# 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
1488# 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
1489# 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
1490# solution, so instead you can add the following to your ebuilds: 1598# solution, so instead you can add the following to your ebuilds:
1491# 1599#
1492# src_install() { 1600# pkg_preinst() {
1493# ... 1601# ...
1494# preserve_old_lib /usr/$(get_libdir)/libogg.so.0 1602# preserve_old_lib /usr/$(get_libdir)/libogg.so.0
1495# ... 1603# ...
1496# } 1604# }
1497# 1605#
1500# preserve_old_lib_notify /usr/$(get_libdir)/libogg.so.0 1608# preserve_old_lib_notify /usr/$(get_libdir)/libogg.so.0
1501# ... 1609# ...
1502# } 1610# }
1503 1611
1504preserve_old_lib() { 1612preserve_old_lib() {
1505 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]"
1506 1618
1507 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1619 local lib dir
1508 SONAME=`basename ${LIB}` 1620 for lib in "$@" ; do
1509 DIRNAME=`dirname ${LIB}` 1621 [[ -e ${ROOT}/${lib} ]] || continue
1510 1622 dir=${lib%/*}
1511 dodir ${DIRNAME} 1623 dodir ${dir} || die "dodir ${dir} failed"
1512 cp ${ROOT}${LIB} ${D}${DIRNAME} 1624 cp "${ROOT}"/${lib} "${D}"/${lib} || die "cp ${lib} failed"
1513 touch ${D}${LIB} 1625 touch "${D}"/${lib}
1514 fi 1626 done
1515} 1627}
1516 1628
1517preserve_old_lib_notify() { 1629preserve_old_lib_notify() {
1518 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
1519 1634
1520 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1635 local lib notice=0
1521 SONAME=`basename ${LIB}` 1636 for lib in "$@" ; do
1522 1637 [[ -e ${ROOT}/${lib} ]] || continue
1638 if [[ ${notice} -eq 0 ]] ; then
1639 notice=1
1523 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."
1524 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,"
1525 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"
1526 ewarn "you will need to execute the following command:" 1643 ewarn "in order to remove these old dependencies. If you do not have this"
1527 ewarn " revdep-rebuild --soname ${SONAME}" 1644 ewarn "helper program, simply emerge the 'gentoolkit' package."
1528 ewarn 1645 ewarn
1529 ewarn "After doing that, you can safely remove ${LIB}"
1530 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1531 fi 1646 fi
1647 ewarn " # revdep-rebuild --library ${lib##*/}"
1648 done
1532} 1649}
1533 1650
1534# 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
1535# certain USE flags 1652# certain USE flags
1536# 1653#
1537# 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>
1538# ex: built_with_use xchat gtk2 1655# ex: built_with_use xchat gtk2
1539# 1656#
1540# Flags: -a all USE flags should be utilized 1657# Flags: -a all USE flags should be utilized
1541# -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
1542# Note: the default flag is '-a' 1661# Note: the default flag is '-a'
1543built_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
1544 local opt=$1 1679 local opt=$1
1545 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1680 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1546 1681
1547 local PKG=$(best_version $1) 1682 local PKG=$(best_version $1)
1683 [[ -z ${PKG} ]] && die "Unable to resolve $1 to an installed package"
1548 shift 1684 shift
1549 1685
1550 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE" 1686 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
1551 [[ ! -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
1552 1719
1553 local USE_BUILT=$(<${USEFILE}) 1720 local USE_BUILT=$(<${USEFILE})
1554 while [[ $# -gt 0 ]] ; do 1721 while [[ $# -gt 0 ]] ; do
1555 if [[ ${opt} = "-o" ]] ; then 1722 if [[ ${opt} = "-o" ]] ; then
1556 has $1 ${USE_BUILT} && return 0 1723 has $1 ${USE_BUILT} && return 0
1571 local f 1738 local f
1572 for f in $(find ${dir} -name configure) ; do 1739 for f in $(find ${dir} -name configure) ; do
1573 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
1574 done 1741 done
1575 eend 0 1742 eend 0
1576}
1577
1578# dopamd <file> [more files]
1579#
1580# Install pam auth config file in /etc/pam.d
1581dopamd() {
1582 [[ -z $1 ]] && die "dopamd requires at least one argument"
1583
1584 use pam || return 0
1585
1586 INSDESTTREE=/etc/pam.d \
1587 doins "$@" || die "failed to install $@"
1588}
1589# newpamd <old name> <new name>
1590#
1591# Install pam file <old name> as <new name> in /etc/pam.d
1592newpamd() {
1593 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1594
1595 use pam || return 0
1596
1597 INSDESTTREE=/etc/pam.d \
1598 newins "$1" "$2" || die "failed to install $1 as $2"
1599} 1743}
1600 1744
1601# make a wrapper script ... 1745# make a wrapper script ...
1602# 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
1603# 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
1613 # 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
1614 # things as $bin ... "./someprog --args" 1758 # things as $bin ... "./someprog --args"
1615 cat << EOF > "${tmpwrapper}" 1759 cat << EOF > "${tmpwrapper}"
1616#!/bin/sh 1760#!/bin/sh
1617cd "${chdir:-.}" 1761cd "${chdir:-.}"
1762if [ -n "${libdir}" ] ; then
1618if [ "\${LD_LIBRARY_PATH+set}" = "set" ] && [ -n "${libdir}" ] ; then 1763 if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
1619 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
1620fi 1768fi
1621exec ${bin} "\$@" 1769exec ${bin} "\$@"
1622EOF 1770EOF
1623 chmod go+rx "${tmpwrapper}" 1771 chmod go+rx "${tmpwrapper}"
1624 if [[ -n ${path} ]] ; then 1772 if [[ -n ${path} ]] ; then

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

  ViewVC Help
Powered by ViewVC 1.1.20