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

Diff of /eclass/eutils.eclass

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

Revision 1.176 Revision 1.279
1# Copyright 1999-2005 Gentoo Foundation 1# Copyright 1999-2006 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.176 2005/05/25 22:07:31 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.279 2007/04/25 09:14:35 carlo Exp $
4#
5# Author: Martin Schlemmer <azarah@gentoo.org>
6# 4#
7# This eclass is for general purpose functions that most ebuilds 5# This eclass is for general purpose functions that most ebuilds
8# have to implement themselves. 6# have to implement themselves.
9# 7#
10# NB: If you add anything, please comment it! 8# NB: If you add anything, please comment it!
9#
10# Maintainer: see each individual function, base-system@gentoo.org as default
11 11
12inherit multilib 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 "`eval echo \$\{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
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 *)
859 type= 888 type=
860 ;; 889 ;;
861 esac 890 esac
862 fi 891 fi
863 892 if [ "${SLOT}" == "0" ] ; then
893 local desktop_name="${PN}"
894 else
895 local desktop_name="${PN}-${SLOT}"
896 fi
897 local desktop="${T}/$(echo ${exec} | sed 's:[[:space:]/:]:_:g')-${desktop_name}.desktop"
864 local desktop=${T}/${exec%% *}-${P}.desktop 898 #local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
865 899
900 cat <<-EOF > "${desktop}"
866echo "[Desktop Entry] 901 [Desktop Entry]
867Encoding=UTF-8 902 Encoding=UTF-8
868Version=0.9.2 903 Version=0.9.2
869Name=${name} 904 Name=${name}
870Type=Application 905 Type=Application
871Comment=${DESCRIPTION} 906 Comment=${DESCRIPTION}
872Exec=${exec} 907 Exec=${exec}
908 TryExec=${exec%% *}
873Path=${path} 909 Path=${path}
874Icon=${icon} 910 Icon=${icon}
875Categories=Application;${type};" > "${desktop}" 911 Categories=Application;${type};
912 EOF
876 913
914 (
915 # wrap the env here so that the 'insinto' call
916 # doesn't corrupt the env of the caller
877 insinto /usr/share/applications 917 insinto /usr/share/applications
878 doins "${desktop}" 918 doins "${desktop}"
879 919 )
880 return 0
881} 920}
921
922
923# Validate desktop entries using desktop-file-utils
924# Carsten Lohrke <carlo@gentoo.org>
925#
926# Usage: validate_desktop_entries [directory ...]
927
928validate_desktop_entries() {
929 if [[ -x /usr/bin/desktop-file-validate ]] ; then
930 einfo "Checking desktop entry validity"
931 local directories=""
932 for d in /usr/share/applications $@ ; do
933 [[ -d ${D}${d} ]] && directories="${directories} ${D}${d}"
934 done
935 if [[ -n ${directories} ]] ; then
936 for FILE in $(find ${directories} -name "*\.desktop" \
937 -not -path '*.hidden*' | sort -u 2>/dev/null)
938 do
939 local temp=$(desktop-file-validate ${FILE} | grep -v "warning:" | \
940 sed -e "s|error: ||" -e "s|${FILE}:|--|g" )
941 [[ -n $temp ]] && elog ${temp/--/${FILE/${D}/}:}
942 done
943 fi
944 echo ""
945 else
946 einfo "Passing desktop entry validity check. Install dev-util/desktop-file-utils, if you want to help to improve Gentoo."
947 fi
948}
949
882 950
883# Make a GDM/KDM Session file 951# Make a GDM/KDM Session file
884# 952#
885# make_desktop_entry(<title>, <command>) 953# make_session_desktop(<title>, <command>)
886# title: File to execute to start the Window Manager 954# title: File to execute to start the Window Manager
887# command: Name of the Window Manager 955# command: Name of the Window Manager
888 956
889make_session_desktop() { 957make_session_desktop() {
890 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1 958 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1
892 960
893 local title=$1 961 local title=$1
894 local command=$2 962 local command=$2
895 local desktop=${T}/${wm}.desktop 963 local desktop=${T}/${wm}.desktop
896 964
965 cat <<-EOF > "${desktop}"
897echo "[Desktop Entry] 966 [Desktop Entry]
898Encoding=UTF-8 967 Encoding=UTF-8
899Name=${title} 968 Name=${title}
900Comment=This session logs you into ${title} 969 Comment=This session logs you into ${title}
901Exec=${command} 970 Exec=${command}
902TryExec=${command} 971 TryExec=${command}
903Type=Application" > "${desktop}" 972 Type=Application
973 EOF
904 974
975 (
976 # wrap the env here so that the 'insinto' call
977 # doesn't corrupt the env of the caller
905 insinto /usr/share/xsessions 978 insinto /usr/share/xsessions
906 doins "${desktop}" 979 doins "${desktop}"
980 )
907} 981}
908 982
909domenu() { 983domenu() {
984 (
985 # wrap the env here so that the 'insinto' call
986 # doesn't corrupt the env of the caller
910 local i j 987 local i j ret=0
911 insinto /usr/share/applications 988 insinto /usr/share/applications
912 for i in "$@" ; do 989 for i in "$@" ; do
913 if [[ -f ${i} ]] ; then 990 if [[ -f ${i} ]] ; then
914 doins "${i}" 991 doins "${i}"
992 ((ret+=$?))
915 elif [[ -d ${i} ]] ; then 993 elif [[ -d ${i} ]] ; then
916 for j in "${i}"/*.desktop ; do 994 for j in "${i}"/*.desktop ; do
917 doins "${j}" 995 doins "${j}"
996 ((ret+=$?))
918 done 997 done
919 fi 998 fi
920 done 999 done
1000 exit ${ret}
1001 )
921} 1002}
922newmenu() { 1003newmenu() {
1004 (
1005 # wrap the env here so that the 'insinto' call
1006 # doesn't corrupt the env of the caller
923 insinto /usr/share/applications 1007 insinto /usr/share/applications
924 newins "$1" "$2" 1008 newins "$@"
1009 )
925} 1010}
926 1011
927doicon() { 1012doicon() {
1013 (
1014 # wrap the env here so that the 'insinto' call
1015 # doesn't corrupt the env of the caller
928 local i j 1016 local i j ret
929 insinto /usr/share/pixmaps 1017 insinto /usr/share/pixmaps
930 for i in "$@" ; do 1018 for i in "$@" ; do
931 if [[ -f ${i} ]] ; then 1019 if [[ -f ${i} ]] ; then
932 doins "${i}" 1020 doins "${i}"
1021 ((ret+=$?))
933 elif [[ -d ${i} ]] ; then 1022 elif [[ -d ${i} ]] ; then
934 for j in "${i}"/*.png ; do 1023 for j in "${i}"/*.png ; do
935 doins "${j}" 1024 doins "${j}"
1025 ((ret+=$?))
936 done 1026 done
937 fi 1027 fi
938 done 1028 done
1029 exit ${ret}
1030 )
939} 1031}
940newicon() { 1032newicon() {
1033 (
1034 # wrap the env here so that the 'insinto' call
1035 # doesn't corrupt the env of the caller
941 insinto /usr/share/pixmaps 1036 insinto /usr/share/pixmaps
942 newins "$1" "$2" 1037 newins "$@"
1038 )
943} 1039}
944 1040
945############################################################## 1041##############################################################
946# END: Handle .desktop files and menu entries # 1042# END: Handle .desktop files and menu entries #
947############################################################## 1043##############################################################
948 1044
949 1045
950# for internal use only (unpack_pdv and unpack_makeself) 1046# for internal use only (unpack_pdv and unpack_makeself)
951find_unpackable_file() { 1047find_unpackable_file() {
952 local src="$1" 1048 local src=$1
953 if [ -z "${src}" ] 1049 if [[ -z ${src} ]] ; then
954 then
955 src="${DISTDIR}/${A}" 1050 src=${DISTDIR}/${A}
956 else 1051 else
957 if [ -e "${DISTDIR}/${src}" ] 1052 if [[ -e ${DISTDIR}/${src} ]] ; then
958 then
959 src="${DISTDIR}/${src}" 1053 src=${DISTDIR}/${src}
960 elif [ -e "${PWD}/${src}" ] 1054 elif [[ -e ${PWD}/${src} ]] ; then
961 then
962 src="${PWD}/${src}" 1055 src=${PWD}/${src}
963 elif [ -e "${src}" ] 1056 elif [[ -e ${src} ]] ; then
964 then
965 src="${src}" 1057 src=${src}
966 fi
967 fi 1058 fi
968 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 1059 fi
1060 [[ ! -e ${src} ]] && return 1
969 echo "${src}" 1061 echo "${src}"
970} 1062}
971 1063
972# Unpack those pesky pdv generated files ... 1064# Unpack those pesky pdv generated files ...
973# They're self-unpacking programs with the binary package stuffed in 1065# They're self-unpacking programs with the binary package stuffed in
974# the middle of the archive. Valve seems to use it a lot ... too bad 1066# the middle of the archive. Valve seems to use it a lot ... too bad
975# it seems to like to segfault a lot :(. So lets take it apart ourselves. 1067# it seems to like to segfault a lot :(. So lets take it apart ourselves.
976# 1068#
977# Usage: unpack_pdv [file to unpack] [size of off_t] 1069# Usage: unpack_pdv [file to unpack] [size of off_t]
978# - you have to specify the off_t size ... i have no idea how to extract that 1070# - you have to specify the off_t size ... i have no idea how to extract that
979# information out of the binary executable myself. basically you pass in 1071# information out of the binary executable myself. basically you pass in
980# the size of the off_t type (in bytes) on the machine that built the pdv 1072# the size of the off_t type (in bytes) on the machine that built the pdv
981# archive. one way to determine this is by running the following commands: 1073# archive. one way to determine this is by running the following commands:
982# strings <pdv archive> | grep lseek 1074# strings <pdv archive> | grep lseek
983# strace -elseek <pdv archive> 1075# strace -elseek <pdv archive>
984# basically look for the first lseek command (we do the strings/grep because 1076# basically look for the first lseek command (we do the strings/grep because
985# sometimes the function call is _llseek or something) and steal the 2nd 1077# sometimes the function call is _llseek or something) and steal the 2nd
986# parameter. here is an example: 1078# parameter. here is an example:
987# root@vapier 0 pdv_unpack # strings hldsupdatetool.bin | grep lseek 1079# root@vapier 0 pdv_unpack # strings hldsupdatetool.bin | grep lseek
988# lseek 1080# lseek
989# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1081# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
990# lseek(3, -4, SEEK_END) = 2981250 1082# lseek(3, -4, SEEK_END) = 2981250
991# thus we would pass in the value of '4' as the second parameter. 1083# thus we would pass in the value of '4' as the second parameter.
992unpack_pdv() { 1084unpack_pdv() {
993 local src="`find_unpackable_file $1`" 1085 local src=$(find_unpackable_file "$1")
994 local sizeoff_t="$2" 1086 local sizeoff_t=$2
995 1087
1088 [[ -z ${src} ]] && die "Could not locate source for '$1'"
996 [ -z "${sizeoff_t}" ] && die "No idea what off_t size was used for this pdv :(" 1089 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
997 1090
998 local shrtsrc="`basename ${src}`" 1091 local shrtsrc=$(basename "${src}")
999 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1092 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1000 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1093 local metaskip=$(tail -c ${sizeoff_t} "${src}" | hexdump -e \"%i\")
1001 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"` 1094 local tailskip=$(tail -c $((${sizeoff_t}*2)) "${src}" | head -c ${sizeoff_t} | hexdump -e \"%i\")
1002 1095
1003 # grab metadata for debug reasons 1096 # grab metadata for debug reasons
1004 local metafile="$(emktemp)" 1097 local metafile=$(emktemp)
1005 tail -c +$((${metaskip}+1)) ${src} > ${metafile} 1098 tail -c +$((${metaskip}+1)) "${src}" > "${metafile}"
1006 1099
1007 # rip out the final file name from the metadata 1100 # rip out the final file name from the metadata
1008 local datafile="`tail -c +$((${metaskip}+1)) ${src} | strings | head -n 1`" 1101 local datafile=$(tail -c +$((${metaskip}+1)) "${src}" | strings | head -n 1)
1009 datafile="`basename ${datafile}`" 1102 datafile=$(basename "${datafile}")
1010 1103
1011 # now lets uncompress/untar the file if need be 1104 # now lets uncompress/untar the file if need be
1012 local tmpfile="$(emktemp)" 1105 local tmpfile=$(emktemp)
1013 tail -c +$((${tailskip}+1)) ${src} 2>/dev/null | head -c 512 > ${tmpfile} 1106 tail -c +$((${tailskip}+1)) ${src} 2>/dev/null | head -c 512 > ${tmpfile}
1014 1107
1015 local iscompressed="`file -b ${tmpfile}`" 1108 local iscompressed=$(file -b "${tmpfile}")
1016 if [ "${iscompressed:0:8}" == "compress" ] ; then 1109 if [[ ${iscompressed:0:8} == "compress" ]] ; then
1017 iscompressed=1 1110 iscompressed=1
1018 mv ${tmpfile}{,.Z} 1111 mv ${tmpfile}{,.Z}
1019 gunzip ${tmpfile} 1112 gunzip ${tmpfile}
1020 else 1113 else
1021 iscompressed=0 1114 iscompressed=0
1022 fi 1115 fi
1023 local istar="`file -b ${tmpfile}`" 1116 local istar=$(file -b "${tmpfile}")
1024 if [ "${istar:0:9}" == "POSIX tar" ] ; then 1117 if [[ ${istar:0:9} == "POSIX tar" ]] ; then
1025 istar=1 1118 istar=1
1026 else 1119 else
1027 istar=0 1120 istar=0
1028 fi 1121 fi
1029 1122
1065# many other game companies. 1158# many other game companies.
1066# 1159#
1067# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1160# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1068# - If the file is not specified then unpack will utilize ${A}. 1161# - If the file is not specified then unpack will utilize ${A}.
1069# - If the offset is not specified then we will attempt to extract 1162# - If the offset is not specified then we will attempt to extract
1070# the proper offset from the script itself. 1163# the proper offset from the script itself.
1071unpack_makeself() { 1164unpack_makeself() {
1165 local src_input=${1:-${A}}
1072 local src="$(find_unpackable_file "$1")" 1166 local src=$(find_unpackable_file "${src_input}")
1073 local skip="$2" 1167 local skip=$2
1074 local exe="$3" 1168 local exe=$3
1075 1169
1170 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1171
1076 local shrtsrc="$(basename "${src}")" 1172 local shrtsrc=$(basename "${src}")
1077 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1173 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1078 if [ -z "${skip}" ] 1174 if [[ -z ${skip} ]] ; then
1079 then
1080 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1175 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1081 local skip=0 1176 local skip=0
1082 exe=tail 1177 exe=tail
1083 case ${ver} in 1178 case ${ver} in
1084 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1179 1.5.*|1.6.0-nv) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
1085 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1180 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1086 ;; 1181 ;;
1087 2.0|2.0.1) 1182 2.0|2.0.1)
1088 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-) 1183 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-)
1089 ;; 1184 ;;
1097 ;; 1192 ;;
1098 2.1.3) 1193 2.1.3)
1099 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1194 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1100 let skip="skip + 1" 1195 let skip="skip + 1"
1101 ;; 1196 ;;
1102 2.1.4) 1197 2.1.4|2.1.5)
1103 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1) 1198 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
1104 skip=$(head -n ${skip} "${src}" | wc -c) 1199 skip=$(head -n ${skip} "${src}" | wc -c)
1105 exe="dd" 1200 exe="dd"
1106 ;; 1201 ;;
1107 *) 1202 *)
1119 dd) exe="dd ibs=${skip} skip=1 obs=1024 conv=sync if='${src}'";; 1214 dd) exe="dd ibs=${skip} skip=1 obs=1024 conv=sync if='${src}'";;
1120 *) die "makeself cant handle exe '${exe}'" 1215 *) die "makeself cant handle exe '${exe}'"
1121 esac 1216 esac
1122 1217
1123 # lets grab the first few bytes of the file to figure out what kind of archive it is 1218 # lets grab the first few bytes of the file to figure out what kind of archive it is
1124 local tmpfile="$(emktemp)" 1219 local tmpfile=$(emktemp)
1125 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}" 1220 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}"
1126 local filetype="$(file -b "${tmpfile}")" 1221 local filetype=$(file -b "${tmpfile}")
1127 case ${filetype} in 1222 case ${filetype} in
1128 *tar\ archive) 1223 *tar\ archive*)
1129 eval ${exe} | tar --no-same-owner -xf - 1224 eval ${exe} | tar --no-same-owner -xf -
1130 ;; 1225 ;;
1131 bzip2*) 1226 bzip2*)
1132 eval ${exe} | bzip2 -dc | tar --no-same-owner -xf - 1227 eval ${exe} | bzip2 -dc | tar --no-same-owner -xf -
1133 ;; 1228 ;;
1152check_license() { 1247check_license() {
1153 local lic=$1 1248 local lic=$1
1154 if [ -z "${lic}" ] ; then 1249 if [ -z "${lic}" ] ; then
1155 lic="${PORTDIR}/licenses/${LICENSE}" 1250 lic="${PORTDIR}/licenses/${LICENSE}"
1156 else 1251 else
1157 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1252 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1158 lic="${PORTDIR}/licenses/${src}" 1253 lic="${PORTDIR}/licenses/${lic}"
1159 elif [ -e "${PWD}/${src}" ] ; then 1254 elif [ -e "${PWD}/${lic}" ] ; then
1160 lic="${PWD}/${src}" 1255 lic="${PWD}/${lic}"
1161 elif [ -e "${src}" ] ; then 1256 elif [ -e "${lic}" ] ; then
1162 lic="${src}" 1257 lic="${lic}"
1163 fi
1164 fi 1258 fi
1259 fi
1165 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1260 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1166 local l="`basename ${lic}`" 1261 local l="`basename ${lic}`"
1167 1262
1168 # here is where we check for the licenses the user already 1263 # here is where we check for the licenses the user already
1169 # accepted ... if we don't find a match, we make the user accept 1264 # accepted ... if we don't find a match, we make the user accept
1170 local shopts=$- 1265 local shopts=$-
1171 local alic 1266 local alic
1172 set -o noglob #so that bash doesn't expand "*" 1267 set -o noglob #so that bash doesn't expand "*"
1173 for alic in ${ACCEPT_LICENSE} ; do 1268 for alic in ${ACCEPT_LICENSE} ; do
1174 if [[ ${alic} == * || ${alic} == ${l} ]]; then 1269 if [[ ${alic} == ${l} ]]; then
1175 set +o noglob; set -${shopts} #reset old shell opts 1270 set +o noglob; set -${shopts} #reset old shell opts
1176 return 0 1271 return 0
1177 fi 1272 fi
1178 done 1273 done
1179 set +o noglob; set -$shopts #reset old shell opts 1274 set +o noglob; set -$shopts #reset old shell opts
1180 1275
1181 local licmsg="$(emktemp)" 1276 local licmsg=$(emktemp)
1182 cat << EOF > ${licmsg} 1277 cat <<-EOF > ${licmsg}
1183********************************************************** 1278 **********************************************************
1184The following license outlines the terms of use of this 1279 The following license outlines the terms of use of this
1185package. You MUST accept this license for installation to 1280 package. You MUST accept this license for installation to
1186continue. When you are done viewing, hit 'q'. If you 1281 continue. When you are done viewing, hit 'q'. If you
1187CTRL+C out of this, the install will not run! 1282 CTRL+C out of this, the install will not run!
1188********************************************************** 1283 **********************************************************
1189 1284
1190EOF 1285 EOF
1191 cat ${lic} >> ${licmsg} 1286 cat ${lic} >> ${licmsg}
1192 ${PAGER:-less} ${licmsg} || die "Could not execute pager (${PAGER}) to accept ${lic}" 1287 ${PAGER:-less} ${licmsg} || die "Could not execute pager (${PAGER}) to accept ${lic}"
1193 einfon "Do you accept the terms of this license (${l})? [yes/no] " 1288 einfon "Do you accept the terms of this license (${l})? [yes/no] "
1194 read alic 1289 read alic
1195 case ${alic} in 1290 case ${alic} in
1212# and when the function returns, you can assume that the cd has been 1307# and when the function returns, you can assume that the cd has been
1213# found at CDROM_ROOT. 1308# found at CDROM_ROOT.
1214# 1309#
1215# normally the cdrom functions will refer to the cds as 'cd #1', 'cd #2', 1310# normally the cdrom functions will refer to the cds as 'cd #1', 'cd #2',
1216# etc... if you want to give the cds better names, then just export 1311# etc... if you want to give the cds better names, then just export
1217# the CDROM_NAME_X variables before calling cdrom_get_cds(). 1312# the appropriate CDROM_NAME variable before calling cdrom_get_cds().
1313# - CDROM_NAME="fooie cd" - for when you only want 1 cd
1314# - CDROM_NAME_1="install cd" - for when you want more than 1 cd
1315# CDROM_NAME_2="data cd"
1316# - CDROM_NAME_SET=( "install cd" "data cd" ) - short hand for CDROM_NAME_#
1218# 1317#
1219# for those multi cd ebuilds, see the cdrom_load_next_cd() below. 1318# for those multi cd ebuilds, see the cdrom_load_next_cd() below.
1220# 1319#
1221# Usage: cdrom_get_cds <file on cd1> [file on cd2] [file on cd3] [...] 1320# Usage: cdrom_get_cds <file on cd1> [file on cd2] [file on cd3] [...]
1222# - this will attempt to locate a cd based upon a file that is on 1321# - this will attempt to locate a cd based upon a file that is on
1223# the cd ... the more files you give this function, the more cds 1322# the cd ... the more files you give this function, the more cds
1224# the cdrom functions will handle 1323# the cdrom functions will handle
1225cdrom_get_cds() { 1324cdrom_get_cds() {
1226 # first we figure out how many cds we're dealing with by 1325 # first we figure out how many cds we're dealing with by
1227 # the # of files they gave us 1326 # the # of files they gave us
1228 local cdcnt=0 1327 local cdcnt=0
1229 local f= 1328 local f=
1230 for f in "$@" ; do 1329 for f in "$@" ; do
1231 cdcnt=$((cdcnt + 1)) 1330 ((++cdcnt))
1232 export CDROM_CHECK_${cdcnt}="$f" 1331 export CDROM_CHECK_${cdcnt}="$f"
1233 done 1332 done
1234 export CDROM_TOTAL_CDS=${cdcnt} 1333 export CDROM_TOTAL_CDS=${cdcnt}
1235 export CDROM_CURRENT_CD=1 1334 export CDROM_CURRENT_CD=1
1236 1335
1237 # now we see if the user gave use CD_ROOT ... 1336 # now we see if the user gave use CD_ROOT ...
1238 # if they did, let's just believe them that it's correct 1337 # if they did, let's just believe them that it's correct
1239 if [[ ! -z ${CD_ROOT} ]] ; then
1240 export CDROM_ROOT=${CD_ROOT}
1241 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1242 return
1243 fi
1244 # do the same for CD_ROOT_X
1245 if [[ ! -z ${CD_ROOT_1} ]] ; then 1338 if [[ -n ${CD_ROOT}${CD_ROOT_1} ]] ; then
1246 local var= 1339 local var=
1247 cdcnt=0 1340 cdcnt=0
1248 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1341 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1249 cdcnt=$((cdcnt + 1)) 1342 ((++cdcnt))
1250 var="CD_ROOT_${cdcnt}" 1343 var="CD_ROOT_${cdcnt}"
1344 [[ -z ${!var} ]] && var="CD_ROOT"
1251 if [[ -z ${!var} ]] ; then 1345 if [[ -z ${!var} ]] ; then
1252 eerror "You must either use just the CD_ROOT" 1346 eerror "You must either use just the CD_ROOT"
1253 eerror "or specify ALL the CD_ROOT_X variables." 1347 eerror "or specify ALL the CD_ROOT_X variables."
1254 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables." 1348 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."
1255 die "could not locate CD_ROOT_${cdcnt}" 1349 die "could not locate CD_ROOT_${cdcnt}"
1256 fi 1350 fi
1257 export CDROM_ROOTS_${cdcnt}="${!var}"
1258 done 1351 done
1259 export CDROM_ROOT=${CDROM_ROOTS_1} 1352 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1260 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1353 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1354 export CDROM_SET=-1
1355 for f in ${CDROM_CHECK_1//:/ } ; do
1356 ((++CDROM_SET))
1357 [[ -e ${CD_ROOT}/${f} ]] && break
1358 done
1359 export CDROM_MATCH=${f}
1261 return 1360 return
1262 fi 1361 fi
1263 1362
1363 # User didn't help us out so lets make sure they know they can
1364 # simplify the whole process ...
1264 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1365 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1265 einfon "This ebuild will need the " 1366 einfo "This ebuild will need the ${CDROM_NAME:-cdrom for ${PN}}"
1266 if [[ -z ${CDROM_NAME} ]] ; then
1267 echo "cdrom for ${PN}."
1268 else
1269 echo "${CDROM_NAME}."
1270 fi
1271 echo 1367 echo
1272 einfo "If you do not have the CD, but have the data files" 1368 einfo "If you do not have the CD, but have the data files"
1273 einfo "mounted somewhere on your filesystem, just export" 1369 einfo "mounted somewhere on your filesystem, just export"
1274 einfo "the variable CD_ROOT so that it points to the" 1370 einfo "the variable CD_ROOT so that it points to the"
1275 einfo "directory containing the files." 1371 einfo "directory containing the files."
1276 echo 1372 echo
1277 einfo "For example:" 1373 einfo "For example:"
1278 einfo "export CD_ROOT=/mnt/cdrom" 1374 einfo "export CD_ROOT=/mnt/cdrom"
1279 echo 1375 echo
1280 else 1376 else
1377 if [[ -n ${CDROM_NAME_SET} ]] ; then
1378 # Translate the CDROM_NAME_SET array into CDROM_NAME_#
1379 cdcnt=0
1380 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1381 ((++cdcnt))
1382 export CDROM_NAME_${cdcnt}="${CDROM_NAME_SET[$((${cdcnt}-1))]}"
1383 done
1384 fi
1385
1281 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1386 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1282 cdcnt=0 1387 cdcnt=0
1283 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1388 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1284 cdcnt=$((cdcnt + 1)) 1389 ((++cdcnt))
1285 var="CDROM_NAME_${cdcnt}" 1390 var="CDROM_NAME_${cdcnt}"
1286 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}" 1391 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1287 done 1392 done
1288 echo 1393 echo
1289 einfo "If you do not have the CDs, but have the data files" 1394 einfo "If you do not have the CDs, but have the data files"
1290 einfo "mounted somewhere on your filesystem, just export" 1395 einfo "mounted somewhere on your filesystem, just export"
1291 einfo "the following variables so they point to the right place:" 1396 einfo "the following variables so they point to the right place:"
1292 einfon "" 1397 einfon ""
1293 cdcnt=0 1398 cdcnt=0
1294 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1399 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1295 cdcnt=$((cdcnt + 1)) 1400 ((++cdcnt))
1296 echo -n " CD_ROOT_${cdcnt}" 1401 echo -n " CD_ROOT_${cdcnt}"
1297 done 1402 done
1298 echo 1403 echo
1299 einfo "Or, if you have all the files in the same place, or" 1404 einfo "Or, if you have all the files in the same place, or"
1300 einfo "you only have one cdrom, you can export CD_ROOT" 1405 einfo "you only have one cdrom, you can export CD_ROOT"
1303 echo 1408 echo
1304 einfo "For example:" 1409 einfo "For example:"
1305 einfo "export CD_ROOT_1=/mnt/cdrom" 1410 einfo "export CD_ROOT_1=/mnt/cdrom"
1306 echo 1411 echo
1307 fi 1412 fi
1413
1414 export CDROM_SET=""
1308 export CDROM_CURRENT_CD=0 1415 export CDROM_CURRENT_CD=0
1309 cdrom_load_next_cd 1416 cdrom_load_next_cd
1310} 1417}
1311 1418
1312# this is only used when you need access to more than one cd. 1419# this is only used when you need access to more than one cd.
1313# when you have finished using the first cd, just call this function. 1420# when you have finished using the first cd, just call this function.
1314# when it returns, CDROM_ROOT will be pointing to the second cd. 1421# when it returns, CDROM_ROOT will be pointing to the second cd.
1315# remember, you can only go forward in the cd chain, you can't go back. 1422# remember, you can only go forward in the cd chain, you can't go back.
1316cdrom_load_next_cd() { 1423cdrom_load_next_cd() {
1317 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1318 local var= 1424 local var
1319 1425 ((++CDROM_CURRENT_CD))
1320 if [[ ! -z ${CD_ROOT} ]] ; then
1321 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1322 return
1323 fi
1324 1426
1325 unset CDROM_ROOT 1427 unset CDROM_ROOT
1326 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1428 var=CD_ROOT_${CDROM_CURRENT_CD}
1429 [[ -z ${!var} ]] && var="CD_ROOT"
1327 if [[ -z ${!var} ]] ; then 1430 if [[ -z ${!var} ]] ; then
1328 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1431 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1329 cdrom_locate_file_on_cd ${!var} 1432 _cdrom_locate_file_on_cd ${!var}
1330 else 1433 else
1331 export CDROM_ROOT=${!var} 1434 export CDROM_ROOT=${!var}
1332 fi 1435 fi
1333 1436
1334 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1437 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1339# all it does is try to locate a give file on a cd ... if the cd isn't 1442# all it does is try to locate a give file on a cd ... if the cd isn't
1340# found, then a message asking for the user to insert the cdrom will be 1443# found, then a message asking for the user to insert the cdrom will be
1341# displayed and we'll hang out here until: 1444# displayed and we'll hang out here until:
1342# (1) the file is found on a mounted cdrom 1445# (1) the file is found on a mounted cdrom
1343# (2) the user hits CTRL+C 1446# (2) the user hits CTRL+C
1344cdrom_locate_file_on_cd() { 1447_cdrom_locate_file_on_cd() {
1448 local mline=""
1449 local showedmsg=0
1450
1345 while [[ -z ${CDROM_ROOT} ]] ; do 1451 while [[ -z ${CDROM_ROOT} ]] ; do
1452 local i=0
1453 local -a cdset=(${*//:/ })
1454 if [[ -n ${CDROM_SET} ]] ; then
1455 cdset=(${cdset[${CDROM_SET}]})
1456 fi
1457
1458 while [[ -n ${cdset[${i}]} ]] ; do
1346 local dir="$(dirname ${@})" 1459 local dir=$(dirname ${cdset[${i}]})
1347 local file="$(basename ${@})" 1460 local file=$(basename ${cdset[${i}]})
1348 local mline=""
1349 local showedmsg=0
1350 1461
1351 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1462 local point= node= fs= foo=
1352 [[ -d ${mline}/${dir} ]] || continue 1463 while read point node fs foo ; do
1464 [[ " cd9660 iso9660 " != *" ${fs} "* ]] && \
1465 ! [[ ${fs} == "subfs" && ",${opts}," == *",fs=cdfss,"* ]] \
1466 && continue
1467 point=${point//\040/ }
1353 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \ 1468 [[ -z $(find "${point}/${dir}" -maxdepth 1 -iname "${file}") ]] && continue
1354 && export CDROM_ROOT=${mline} 1469 export CDROM_ROOT=${point}
1470 export CDROM_SET=${i}
1471 export CDROM_MATCH=${cdset[${i}]}
1472 return
1473 done <<< "$(get_mounts)"
1474
1475 ((++i))
1355 done 1476 done
1356 1477
1357 if [[ -z ${CDROM_ROOT} ]] ; then
1358 echo 1478 echo
1359 if [[ ${showedmsg} -eq 0 ]] ; then 1479 if [[ ${showedmsg} -eq 0 ]] ; then
1360 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1480 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1361 if [[ -z ${CDROM_NAME} ]] ; then 1481 if [[ -z ${CDROM_NAME} ]] ; then
1362 einfo "Please insert the cdrom for ${PN} now !" 1482 einfo "Please insert+mount the cdrom for ${PN} now !"
1363 else
1364 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1365 fi
1366 else 1483 else
1367 if [[ -z ${CDROM_NAME_1} ]] ; then
1368 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1369 else
1370 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1371 einfo "Please insert+mount the ${!var} cdrom now !" 1484 einfo "Please insert+mount the ${CDROM_NAME} cdrom now !"
1372 fi
1373 fi 1485 fi
1374 showedmsg=1 1486 else
1487 if [[ -z ${CDROM_NAME_1} ]] ; then
1488 einfo "Please insert+mount cd #${CDROM_CURRENT_CD} for ${PN} now !"
1489 else
1490 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1491 einfo "Please insert+mount the ${!var} cdrom now !"
1492 fi
1375 fi 1493 fi
1494 showedmsg=1
1495 fi
1376 einfo "Press return to scan for the cd again" 1496 einfo "Press return to scan for the cd again"
1377 einfo "or hit CTRL+C to abort the emerge." 1497 einfo "or hit CTRL+C to abort the emerge."
1378 read 1498 echo
1379 fi 1499 einfo "If you are having trouble with the detection"
1500 einfo "of your CD, it is possible that you do not have"
1501 einfo "Joliet support enabled in your kernel. Please"
1502 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1503 read || die "something is screwed with your system"
1380 done 1504 done
1381} 1505}
1382 1506
1383# Make sure that LINGUAS only contains languages that 1507# Make sure that LINGUAS only contains languages that
1384# a package can support 1508# a package can support
1385# 1509#
1386# usage: strip-linguas <allow LINGUAS> 1510# usage: strip-linguas <allow LINGUAS>
1387# strip-linguas -i <directories of .po files> 1511# strip-linguas -i <directories of .po files>
1388# strip-linguas -u <directories of .po files> 1512# strip-linguas -u <directories of .po files>
1389# 1513#
1390# The first form allows you to specify a list of LINGUAS. 1514# The first form allows you to specify a list of LINGUAS.
1391# The -i builds a list of po files found in all the 1515# The -i builds a list of po files found in all the
1392# directories and uses the intersection of the lists. 1516# directories and uses the intersection of the lists.
1393# The -u builds a list of po files found in all the 1517# The -u builds a list of po files found in all the
1394# directories and uses the union of the lists. 1518# directories and uses the union of the lists.
1395strip-linguas() { 1519strip-linguas() {
1396 local ls newls 1520 local ls newls nols
1397 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then 1521 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1398 local op=$1; shift 1522 local op=$1; shift
1399 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1523 ls=$(find "$1" -name '*.po' -exec basename {} .po \;); shift
1400 local d f 1524 local d f
1401 for d in "$@" ; do 1525 for d in "$@" ; do
1402 if [[ ${op} == "-u" ]] ; then 1526 if [[ ${op} == "-u" ]] ; then
1403 newls=${ls} 1527 newls=${ls}
1404 else 1528 else
1405 newls="" 1529 newls=""
1406 fi 1530 fi
1407 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1531 for f in $(find "$d" -name '*.po' -exec basename {} .po \;) ; do
1408 if [[ ${op} == "-i" ]] ; then 1532 if [[ ${op} == "-i" ]] ; then
1409 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}" 1533 hasq ${f} ${ls} && newls="${newls} ${f}"
1410 else 1534 else
1411 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}" 1535 hasq ${f} ${ls} || newls="${newls} ${f}"
1412 fi 1536 fi
1413 done 1537 done
1414 ls=${newls} 1538 ls=${newls}
1415 done 1539 done
1416 ls=${ls//.po}
1417 else 1540 else
1418 ls=$@ 1541 ls="$@"
1419 fi 1542 fi
1420 1543
1421 ls=" ${ls} " 1544 nols=""
1422 newls="" 1545 newls=""
1423 for f in ${LINGUAS} ; do 1546 for f in ${LINGUAS} ; do
1424 if [[ ${ls/ ${f} /} != ${ls} ]] ; then 1547 if hasq ${f} ${ls} ; then
1425 newls="${newls} ${f}" 1548 newls="${newls} ${f}"
1426 else 1549 else
1427 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1550 nols="${nols} ${f}"
1428 fi 1551 fi
1429 done 1552 done
1430 if [[ -z ${newls} ]] ; then 1553 [[ -n ${nols} ]] \
1431 export LINGUAS="" 1554 && ewarn "Sorry, but ${PN} does not support the LINGUAs:" ${nols}
1432 else
1433 export LINGUAS=${newls:1} 1555 export LINGUAS=${newls:1}
1434 fi
1435} 1556}
1436 1557
1437# moved from kernel.eclass since they are generally useful outside of 1558# moved from kernel.eclass since they are generally useful outside of
1438# kernel.eclass -iggy (20041002) 1559# kernel.eclass -iggy (20041002)
1439 1560
1451 x86) export ARCH="i386";; 1572 x86) export ARCH="i386";;
1452 amd64) export ARCH="x86_64";; 1573 amd64) export ARCH="x86_64";;
1453 hppa) export ARCH="parisc";; 1574 hppa) export ARCH="parisc";;
1454 mips) export ARCH="mips";; 1575 mips) export ARCH="mips";;
1455 sparc) export ARCH="$(tc-arch-kernel)";; # Yeah this is ugly, but it's even WORSE if you don't do this. linux-info.eclass's set_arch_to_kernel is fixed, but won't get used over this one! 1576 sparc) export ARCH="$(tc-arch-kernel)";; # Yeah this is ugly, but it's even WORSE if you don't do this. linux-info.eclass's set_arch_to_kernel is fixed, but won't get used over this one!
1456 *) export ARCH="${ARCH}";; 1577 *) export ARCH="${ARCH}";;
1457 esac 1578 esac
1458} 1579}
1459 1580
1460# set's ARCH back to what portage expects 1581# set's ARCH back to what portage expects
1461set_arch_to_portage() { 1582set_arch_to_portage() {
1468 1589
1469# Jeremy Huddleston <eradicator@gentoo.org>: 1590# Jeremy Huddleston <eradicator@gentoo.org>:
1470# preserve_old_lib /path/to/libblah.so.0 1591# preserve_old_lib /path/to/libblah.so.0
1471# preserve_old_lib_notify /path/to/libblah.so.0 1592# preserve_old_lib_notify /path/to/libblah.so.0
1472# 1593#
1473# These functions are useful when a lib in your package changes --soname. Such 1594# These functions are useful when a lib in your package changes --library. Such
1474# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0 1595# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0
1475# would break packages that link against it. Most people get around this 1596# would break packages that link against it. Most people get around this
1476# by using the portage SLOT mechanism, but that is not always a relevant 1597# by using the portage SLOT mechanism, but that is not always a relevant
1477# solution, so instead you can add the following to your ebuilds: 1598# solution, so instead you can add the following to your ebuilds:
1478# 1599#
1479# src_install() { 1600# pkg_preinst() {
1480# ... 1601# ...
1481# preserve_old_lib /usr/$(get_libdir)/libogg.so.0 1602# preserve_old_lib /usr/$(get_libdir)/libogg.so.0
1482# ... 1603# ...
1483# } 1604# }
1484# 1605#
1487# preserve_old_lib_notify /usr/$(get_libdir)/libogg.so.0 1608# preserve_old_lib_notify /usr/$(get_libdir)/libogg.so.0
1488# ... 1609# ...
1489# } 1610# }
1490 1611
1491preserve_old_lib() { 1612preserve_old_lib() {
1492 LIB=$1 1613 if [[ ${EBUILD_PHASE} != "preinst" ]] ; then
1614 eerror "preserve_old_lib() must be called from pkg_preinst() only"
1615 die "Invalid preserve_old_lib() usage"
1616 fi
1617 [[ -z $1 ]] && die "Usage: preserve_old_lib <library to preserve> [more libraries to preserve]"
1493 1618
1494 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1619 local lib dir
1495 SONAME=`basename ${LIB}` 1620 for lib in "$@" ; do
1496 DIRNAME=`dirname ${LIB}` 1621 [[ -e ${ROOT}/${lib} ]] || continue
1497 1622 dir=${lib%/*}
1498 dodir ${DIRNAME} 1623 dodir ${dir} || die "dodir ${dir} failed"
1499 cp ${ROOT}${LIB} ${D}${DIRNAME} 1624 cp "${ROOT}"/${lib} "${D}"/${lib} || die "cp ${lib} failed"
1500 touch ${D}${LIB} 1625 touch "${D}"/${lib}
1501 fi 1626 done
1502} 1627}
1503 1628
1504preserve_old_lib_notify() { 1629preserve_old_lib_notify() {
1505 LIB=$1 1630 if [[ ${EBUILD_PHASE} != "postinst" ]] ; then
1631 eerror "preserve_old_lib_notify() must be called from pkg_postinst() only"
1632 die "Invalid preserve_old_lib_notify() usage"
1633 fi
1506 1634
1507 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1635 local lib notice=0
1508 SONAME=`basename ${LIB}` 1636 for lib in "$@" ; do
1509 1637 [[ -e ${ROOT}/${lib} ]] || continue
1638 if [[ ${notice} -eq 0 ]] ; then
1639 notice=1
1510 einfo "An old version of an installed library was detected on your system." 1640 ewarn "Old versions of installed libraries were detected on your system."
1511 einfo "In order to avoid breaking packages that link against is, this older version" 1641 ewarn "In order to avoid breaking packages that depend on these old libs,"
1512 einfo "is not being removed. In order to make full use of this newer version," 1642 ewarn "the libraries are not being removed. You need to run revdep-rebuild"
1513 einfo "you will need to execute the following command:" 1643 ewarn "in order to remove these old dependencies. If you do not have this"
1514 einfo " revdep-rebuild --soname ${SONAME}" 1644 ewarn "helper program, simply emerge the 'gentoolkit' package."
1515 einfo 1645 ewarn
1516 einfo "After doing that, you can safely remove ${LIB}"
1517 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild"
1518 fi 1646 fi
1647 ewarn " # revdep-rebuild --library ${lib##*/}"
1648 done
1519} 1649}
1520 1650
1521# Hack for people to figure out if a package was built with 1651# Hack for people to figure out if a package was built with
1522# certain USE flags 1652# certain USE flags
1523# 1653#
1524# Usage: built_with_use [-a|-o] <DEPEND ATOM> <List of USE flags> 1654# Usage: built_with_use [--missing <action>] [-a|-o] <DEPEND ATOM> <List of USE flags>
1525# ex: built_with_use xchat gtk2 1655# ex: built_with_use xchat gtk2
1526# 1656#
1527# Flags: -a all USE flags should be utilized 1657# Flags: -a all USE flags should be utilized
1528# -o at least one USE flag should be utilized 1658# -o at least one USE flag should be utilized
1659# --missing peform the specified action if the flag is not in IUSE (true/false/die)
1660# --hidden USE flag we're checking is hidden expanded so it isnt in IUSE
1529# Note: the default flag is '-a' 1661# Note: the default flag is '-a'
1530built_with_use() { 1662built_with_use() {
1663 local hidden="no"
1664 if [[ $1 == "--hidden" ]] ; then
1665 hidden="yes"
1666 shift
1667 fi
1668
1669 local missing_action="die"
1670 if [[ $1 == "--missing" ]] ; then
1671 missing_action=$2
1672 shift ; shift
1673 case ${missing_action} in
1674 true|false|die) ;;
1675 *) die "unknown action '${missing_action}'";;
1676 esac
1677 fi
1678
1531 local opt=$1 1679 local opt=$1
1532 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1680 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1533 1681
1534 local PKG=$(best_version $1) 1682 local PKG=$(best_version $1)
1683 [[ -z ${PKG} ]] && die "Unable to resolve $1 to an installed package"
1535 shift 1684 shift
1536 1685
1537 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE" 1686 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
1538 [[ ! -e ${USEFILE} ]] && return 1 1687 local IUSEFILE=${ROOT}/var/db/pkg/${PKG}/IUSE
1688
1689 # if the IUSE file doesn't exist, the read will error out, we need to handle
1690 # this gracefully
1691 if [[ ! -e ${USEFILE} ]] || [[ ! -e ${IUSEFILE} && ${hidden} == "no" ]] ; then
1692 case ${missing_action} in
1693 true) return 0;;
1694 false) return 1;;
1695 die) die "Unable to determine what USE flags $PKG was built with";;
1696 esac
1697 fi
1698
1699 if [[ ${hidden} == "no" ]] ; then
1700 local IUSE_BUILT=$(<${IUSEFILE})
1701 # Don't check USE_EXPAND #147237
1702 local expand
1703 for expand in $(echo ${USE_EXPAND} | tr '[:upper:]' '[:lower:]') ; do
1704 if [[ $1 == ${expand}_* ]] ; then
1705 expand=""
1706 break
1707 fi
1708 done
1709 if [[ -n ${expand} ]] ; then
1710 if ! has $1 ${IUSE_BUILT} ; then
1711 case ${missing_action} in
1712 true) return 0;;
1713 false) return 1;;
1714 die) die "$PKG does not actually support the $1 USE flag!";;
1715 esac
1716 fi
1717 fi
1718 fi
1539 1719
1540 local USE_BUILT=$(<${USEFILE}) 1720 local USE_BUILT=$(<${USEFILE})
1541 while [[ $# -gt 0 ]] ; do 1721 while [[ $# -gt 0 ]] ; do
1542 if [[ ${opt} = "-o" ]] ; then 1722 if [[ ${opt} = "-o" ]] ; then
1543 has $1 ${USE_BUILT} && return 0 1723 has $1 ${USE_BUILT} && return 0
1558 local f 1738 local f
1559 for f in $(find ${dir} -name configure) ; do 1739 for f in $(find ${dir} -name configure) ; do
1560 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null 1740 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
1561 done 1741 done
1562 eend 0 1742 eend 0
1563}
1564
1565# dopamd <file> [more files]
1566#
1567# Install pam auth config file in /etc/pam.d
1568dopamd() {
1569 [[ -z $1 ]] && die "dopamd requires at least one argument"
1570
1571 use pam || return 0
1572
1573 INSDESTTREE=/etc/pam.d \
1574 doins "$@" || die "failed to install $@"
1575}
1576# newpamd <old name> <new name>
1577#
1578# Install pam file <old name> as <new name> in /etc/pam.d
1579newpamd() {
1580 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1581
1582 use pam || return 0
1583
1584 INSDESTTREE=/etc/pam.d \
1585 newins "$1" "$2" || die "failed to install $1 as $2"
1586} 1743}
1587 1744
1588# make a wrapper script ... 1745# make a wrapper script ...
1589# NOTE: this was originally games_make_wrapper, but I noticed other places where 1746# NOTE: this was originally games_make_wrapper, but I noticed other places where
1590# this could be used, so I have moved it here and made it not games-specific 1747# this could be used, so I have moved it here and made it not games-specific
1595# $4 == extra LD_LIBRARY_PATH's (make it : delimited) 1752# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1596# $5 == path for wrapper 1753# $5 == path for wrapper
1597make_wrapper() { 1754make_wrapper() {
1598 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5 1755 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1599 local tmpwrapper=$(emktemp) 1756 local tmpwrapper=$(emktemp)
1757 # We don't want to quote ${bin} so that people can pass complex
1758 # things as $bin ... "./someprog --args"
1600 cat << EOF > "${tmpwrapper}" 1759 cat << EOF > "${tmpwrapper}"
1601#!/bin/sh 1760#!/bin/sh
1602cd "${chdir}" 1761cd "${chdir:-.}"
1762if [ -n "${libdir}" ] ; then
1763 if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
1603export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}" 1764 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1765 else
1766 export LD_LIBRARY_PATH="${libdir}"
1767 fi
1768fi
1604exec ${bin} "\$@" 1769exec ${bin} "\$@"
1605EOF 1770EOF
1606 chmod go+rx "${tmpwrapper}" 1771 chmod go+rx "${tmpwrapper}"
1607 if [ -n "${5}" ] 1772 if [[ -n ${path} ]] ; then
1608 then
1609 exeinto ${5} 1773 exeinto "${path}"
1610 newexe "${tmpwrapper}" "${wrapper}" 1774 newexe "${tmpwrapper}" "${wrapper}"
1611 else 1775 else
1612 newbin "${tmpwrapper}" "${wrapper}" 1776 newbin "${tmpwrapper}" "${wrapper}"
1613 fi 1777 fi
1614} 1778}

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

  ViewVC Help
Powered by ViewVC 1.1.20