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

Diff of /eclass/eutils.eclass

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

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

Legend:
Removed from v.1.178  
changed lines
  Added in v.1.268

  ViewVC Help
Powered by ViewVC 1.1.20