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

Diff of /eclass/eutils.eclass

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

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

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

  ViewVC Help
Powered by ViewVC 1.1.20