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

Diff of /eclass/eutils.eclass

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

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

Legend:
Removed from v.1.200  
changed lines
  Added in v.1.281

  ViewVC Help
Powered by ViewVC 1.1.20