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

Diff of /eclass/eutils.eclass

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

Revision 1.172 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.172 2005/05/20 02:09:19 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=""
103# Change the printed message for multiple patches.
104EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..."
130# Force applying bulk patches even if not following the style: 105# Force applying bulk patches even if not following the style:
131# 106#
132# ??_${ARCH}_foo.${EPATCH_SUFFIX} 107# ??_${ARCH}_foo.${EPATCH_SUFFIX}
133# 108#
134EPATCH_FORCE="no" 109EPATCH_FORCE="no"
135 110
136# 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
137# or two patches. 112# or two patches.
148# 123#
149# Patches are applied in current directory. 124# Patches are applied in current directory.
150# 125#
151# Bulk Patches should preferibly have the form of: 126# Bulk Patches should preferibly have the form of:
152# 127#
153# ??_${ARCH}_foo.${EPATCH_SUFFIX} 128# ??_${ARCH}_foo.${EPATCH_SUFFIX}
154# 129#
155# For example: 130# For example:
156# 131#
157# 01_all_misc-fix.patch.bz2 132# 01_all_misc-fix.patch.bz2
158# 02_sparc_another-fix.patch.bz2 133# 02_sparc_another-fix.patch.bz2
159# 134#
160# 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
161# specific patches. 136# specific patches.
162# 137#
163# 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
165# hand its a directory, it will set EPATCH_SOURCE to this. 140# hand its a directory, it will set EPATCH_SOURCE to this.
166# 141#
167# <azarah@gentoo.org> (10 Nov 2002) 142# <azarah@gentoo.org> (10 Nov 2002)
168# 143#
169epatch() { 144epatch() {
145 _epatch_draw_line() {
146 [[ -z $1 ]] && set "$(printf "%65s" '')"
147 echo "${1//?/=}"
148 }
149 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; }
170 local PIPE_CMD="" 150 local PIPE_CMD=""
171 local STDERR_TARGET="${T}/$$.out" 151 local STDERR_TARGET="${T}/$$.out"
172 local PATCH_TARGET="${T}/$$.patch" 152 local PATCH_TARGET="${T}/$$.patch"
173 local PATCH_SUFFIX="" 153 local PATCH_SUFFIX=""
174 local SINGLE_PATCH="no" 154 local SINGLE_PATCH="no"
175 local x="" 155 local x=""
156
157 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
176 158
177 if [ "$#" -gt 1 ] 159 if [ "$#" -gt 1 ]
178 then 160 then
179 local m="" 161 local m=""
180 for m in "$@" ; do 162 for m in "$@" ; do
238 ;; 220 ;;
239 esac 221 esac
240 222
241 if [ "${SINGLE_PATCH}" = "no" ] 223 if [ "${SINGLE_PATCH}" = "no" ]
242 then 224 then
243 einfo "Applying various patches (bugfixes/updates) ..." 225 einfo "${EPATCH_MULTI_MSG}"
244 fi 226 fi
245 for x in ${EPATCH_SOURCE} 227 for x in ${EPATCH_SOURCE}
246 do 228 do
247 # New ARCH dependant patch naming scheme ... 229 # New ARCH dependant patch naming scheme ...
248 # 230 #
249 # ???_arch_foo.patch 231 # ???_arch_foo.patch
250 # 232 #
251 if [ -f ${x} ] && \ 233 if [ -f ${x} ] && \
252 ([ "${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}" ] || \
253 [ "${EPATCH_FORCE}" = "yes" ]) 235 [ "${EPATCH_FORCE}" = "yes" ])
254 then 236 then
255 local count=0 237 local count=0
256 local popts="${EPATCH_OPTS}" 238 local popts="${EPATCH_OPTS}"
257 local patchname=${x##*/} 239 local patchname=${x##*/}
258 240
271 einfo "${EPATCH_SINGLE_MSG}" 253 einfo "${EPATCH_SINGLE_MSG}"
272 else 254 else
273 einfo "Applying ${patchname} ..." 255 einfo "Applying ${patchname} ..."
274 fi 256 fi
275 else 257 else
276 einfo " ${patchname} ..." 258 einfo " ${patchname} ..."
277 fi 259 fi
278 260
279 echo "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 261 echo "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
280 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 262 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
281 263
282 # Allow for prefix to differ ... im lazy, so shoot me :/ 264 # Allow for prefix to differ ... im lazy, so shoot me :/
283 while [ "${count}" -lt 5 ] 265 while [ "${count}" -lt 5 ]
284 do 266 do
285 # Generate some useful debug info ... 267 # Generate some useful debug info ...
286 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 268 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
287 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 269 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
288 270
289 if [ "${PATCH_SUFFIX}" != "patch" ] 271 if [ "${PATCH_SUFFIX}" != "patch" ]
290 then 272 then
291 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 273 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
292 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 274 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
293 else 275 else
294 PATCH_TARGET="${x}" 276 PATCH_TARGET="${x}"
295 fi 277 fi
296 278
297 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 279 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
298 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##*/}
299 281
300 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 282 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
301 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 283 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
302 284
303 if [ "${PATCH_SUFFIX}" != "patch" ] 285 if [ "${PATCH_SUFFIX}" != "patch" ]
304 then 286 then
305 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
306 then 288 then
310 count=5 292 count=5
311 break 293 break
312 fi 294 fi
313 fi 295 fi
314 296
315 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
316 then 298 then
317 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 299 _epatch_draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
318 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 300 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
319 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 301 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
320 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 302 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
321 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 303 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
322 304
323 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
324 307
325 if [ "$?" -ne 0 ] 308 if [ "$?" -ne 0 ]
326 then 309 then
327 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##*/}
328 echo 311 echo
367 then 350 then
368 einfo "Done with patching" 351 einfo "Done with patching"
369 fi 352 fi
370} 353}
371 354
372# This function check how many cpu's are present, and then set
373# -j in MAKEOPTS accordingly.
374#
375# Thanks to nall <nall@gentoo.org> for this.
376#
377get_number_of_jobs() {
378 local jobs=0
379
380 if [ ! -r /proc/cpuinfo ]
381 then
382 return 1
383 fi
384
385 # This bit is from H?kan Wessberg <nacka-gentoo@refug.org>, bug #13565.
386 if [ "`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | wc -l`" -gt 0 ]
387 then
388 ADMINOPTS="`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | cut -d= -f2 | sed 's/\"//g'`"
389 ADMINPARAM="`echo ${ADMINOPTS} | gawk '{match($0, /-j *[0-9]*/, opt); print opt[0]}'`"
390 ADMINPARAM="${ADMINPARAM/-j}"
391 fi
392
393 export MAKEOPTS="`echo ${MAKEOPTS} | sed -e 's:-j *[0-9]*::g'`"
394
395 if [ "${ARCH}" = "amd64" -o "${ARCH}" = "x86" -o "${ARCH}" = "hppa" -o \
396 "${ARCH}" = "arm" -o "${ARCH}" = "mips" -o "${ARCH}" = "ia64" ]
397 then
398 # these archs will always have "[Pp]rocessor"
399 jobs="$((`grep -c ^[Pp]rocessor /proc/cpuinfo` * 2))"
400
401 elif [ "${ARCH}" = "sparc" -o "${ARCH}" = "sparc64" ]
402 then
403 # sparc always has "ncpus active"
404 jobs="$((`grep "^ncpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
405
406 elif [ "${ARCH}" = "alpha" ]
407 then
408 # alpha has "cpus active", but only when compiled with SMP
409 if [ "`grep -c "^cpus active" /proc/cpuinfo`" -eq 1 ]
410 then
411 jobs="$((`grep "^cpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
412 else
413 jobs=2
414 fi
415
416 elif [ "${ARCH}" = "ppc" -o "${ARCH}" = "ppc64" ]
417 then
418 # ppc has "processor", but only when compiled with SMP
419 if [ "`grep -c "^processor" /proc/cpuinfo`" -eq 1 ]
420 then
421 jobs="$((`grep -c ^processor /proc/cpuinfo` * 2))"
422 else
423 jobs=2
424 fi
425 elif [ "${ARCH}" = "s390" ]
426 then
427 # s390 has "# processors : "
428 jobs="$((`grep "^\# processors" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
429 else
430 jobs="$((`grep -c ^cpu /proc/cpuinfo` * 2))"
431 die "Unknown ARCH -- ${ARCH}!"
432 fi
433
434 # Make sure the number is valid ...
435 if [ "${jobs}" -lt 1 ]
436 then
437 jobs=1
438 fi
439
440 if [ -n "${ADMINPARAM}" ]
441 then
442 if [ "${jobs}" -gt "${ADMINPARAM}" ]
443 then
444 einfo "Setting make jobs to \"-j${ADMINPARAM}\" to ensure successful merge ..."
445 export MAKEOPTS="${MAKEOPTS} -j${ADMINPARAM}"
446 else
447 einfo "Setting make jobs to \"-j${jobs}\" to ensure successful merge ..."
448 export MAKEOPTS="${MAKEOPTS} -j${jobs}"
449 fi
450 fi
451}
452
453# Cheap replacement for when debianutils (and thus mktemp) 355# Cheap replacement for when debianutils (and thus mktemp)
454# does not exist on the users system 356# does not exist on the users system
455# vapier@gentoo.org 357# vapier@gentoo.org
456# 358#
457# Takes just 1 optional parameter (the directory to create tmpfile in) 359# Takes just 1 optional parameter (the directory to create tmpfile in)
458emktemp() { 360emktemp() {
459 local exe="touch" 361 local exe="touch"
460 [ "$1" == "-d" ] && exe="mkdir" && shift 362 [[ $1 == -d ]] && exe="mkdir" && shift
461 local topdir="$1" 363 local topdir=$1
462 364
463 if [ -z "${topdir}" ] 365 if [[ -z ${topdir} ]] ; then
464 then
465 [ -z "${T}" ] \ 366 [[ -z ${T} ]] \
466 && topdir="/tmp" \ 367 && topdir="/tmp" \
467 || topdir="${T}" 368 || topdir=${T}
468 fi 369 fi
469 370
470 if [ -z "$(type -p mktemp)" ] 371 if [[ -z $(type -p mktemp) ]] ; then
471 then
472 local tmp=/ 372 local tmp=/
473 while [ -e "${tmp}" ] ; do 373 while [[ -e ${tmp} ]] ; do
474 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 374 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
475 done 375 done
476 ${exe} "${tmp}" 376 ${exe} "${tmp}" || ${exe} -p "${tmp}"
477 echo "${tmp}" 377 echo "${tmp}"
478 else 378 else
479 [ "${exe}" == "touch" ] \ 379 if [[ ${exe} == "touch" ]] ; then
480 && exe="-p" \ 380 [[ ${USERLAND} == "GNU" ]] \
481 || exe="-d" 381 && mktemp -p "${topdir}" \
482 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
483 fi 388 fi
484} 389}
485 390
486# Small wrapper for getent (Linux), nidump (Mac OS X), 391# Small wrapper for getent (Linux), nidump (Mac OS X),
487# and pw (FreeBSD) used in enewuser()/enewgroup() 392# and pw (FreeBSD) used in enewuser()/enewgroup()
488# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 393# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
489# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 394# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
490# 395#
491# egetent(database, key) 396# egetent(database, key)
492egetent() { 397egetent() {
493 if useq ppc-macos ; then 398 case ${CHOST} in
399 *-darwin*)
494 case "$2" in 400 case "$2" in
495 *[!0-9]*) # Non numeric 401 *[!0-9]*) # Non numeric
496 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 402 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
497 ;; 403 ;;
498 *) # Numeric 404 *) # Numeric
499 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 405 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
500 ;; 406 ;;
501 esac 407 esac
502 elif useq x86-fbsd ; then 408 ;;
503 local action 409 *-freebsd*|*-dragonfly*)
504 if [ "$1" == "passwd" ] 410 local opts action="user"
505 then 411 [[ $1 == "passwd" ]] || action="group"
506 action="user" 412
507 else 413 # lookup by uid/gid
508 action="group" 414 if [[ $2 == [[:digit:]]* ]] ; then
415 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
509 fi 416 fi
417
510 pw show "${action}" "$2" -q 418 pw show ${action} ${opts} "$2" -q
511 else 419 ;;
420 *-netbsd*|*-openbsd*)
421 grep "$2:\*:" /etc/$1
422 ;;
423 *)
512 which nscd >& /dev/null && nscd -i "$1" 424 type -p nscd >& /dev/null && nscd -i "$1"
513 getent "$1" "$2" 425 getent "$1" "$2"
514 fi 426 ;;
427 esac
515} 428}
516 429
517# Simplify/standardize adding users to the system 430# Simplify/standardize adding users to the system
518# vapier@gentoo.org 431# vapier@gentoo.org
519# 432#
526# shell: /bin/false 439# shell: /bin/false
527# homedir: /dev/null 440# homedir: /dev/null
528# groups: none 441# groups: none
529# extra: comment of 'added by portage for ${PN}' 442# extra: comment of 'added by portage for ${PN}'
530enewuser() { 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
531 # get the username 451 # get the username
532 local euser="$1"; shift 452 local euser=$1; shift
533 if [ -z "${euser}" ] 453 if [[ -z ${euser} ]] ; then
534 then
535 eerror "No username specified !" 454 eerror "No username specified !"
536 die "Cannot call enewuser without a username" 455 die "Cannot call enewuser without a username"
537 fi 456 fi
538 457
539 # lets see if the username already exists 458 # lets see if the username already exists
540 if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ] 459 if [[ -n $(egetent passwd "${euser}") ]] ; then
541 then
542 return 0 460 return 0
543 fi 461 fi
544 einfo "Adding user '${euser}' to your system ..." 462 einfo "Adding user '${euser}' to your system ..."
545 463
546 # options to pass to useradd 464 # options to pass to useradd
547 local opts= 465 local opts=
548 466
549 # handle uid 467 # handle uid
550 local euid="$1"; shift 468 local euid=$1; shift
551 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] 469 if [[ -n ${euid} && ${euid} != -1 ]] ; then
552 then
553 if [ "${euid}" -gt 0 ] 470 if [[ ${euid} -gt 0 ]] ; then
554 then
555 if [ ! -z "`egetent passwd ${euid}`" ] 471 if [[ -n $(egetent passwd ${euid}) ]] ; then
556 then
557 euid="next" 472 euid="next"
558 fi 473 fi
559 else 474 else
560 eerror "Userid given but is not greater than 0 !" 475 eerror "Userid given but is not greater than 0 !"
561 die "${euid} is not a valid UID" 476 die "${euid} is not a valid UID"
562 fi 477 fi
563 else 478 else
564 euid="next" 479 euid="next"
565 fi 480 fi
566 if [ "${euid}" == "next" ] 481 if [[ ${euid} == "next" ]] ; then
567 then 482 for ((euid = 101; euid <= 999; euid++)); do
568 local pwrange
569 if [ "${USERLAND}" == "BSD" ] ; then
570 pwrange="`jot 898 101`"
571 else
572 pwrange="`seq 101 999`"
573 fi
574 for euid in ${pwrange} ; do
575 [ -z "`egetent passwd ${euid}`" ] && break 483 [[ -z $(egetent passwd ${euid}) ]] && break
576 done 484 done
577 fi 485 fi
578 opts="${opts} -u ${euid}" 486 opts="${opts} -u ${euid}"
579 einfo " - Userid: ${euid}" 487 einfo " - Userid: ${euid}"
580 488
581 # handle shell 489 # handle shell
582 local eshell="$1"; shift 490 local eshell=$1; shift
583 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ] 491 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
584 then 492 if [[ ! -e ${ROOT}${eshell} ]] ; then
585 if [ ! -e "${eshell}" ]
586 then
587 eerror "A shell was specified but it does not exist !" 493 eerror "A shell was specified but it does not exist !"
588 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"
589 fi 499 fi
590 else 500 else
591 if [ "${USERLAND}" == "BSD" ] 501 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
592 then 502 [[ -x ${ROOT}${shell} ]] && break
593 eshell="/usr/bin/false" 503 done
594 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
595 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
596 fi 513 fi
514
515 eshell=${shell}
597 fi 516 fi
598 einfo " - Shell: ${eshell}" 517 einfo " - Shell: ${eshell}"
599 opts="${opts} -s ${eshell}" 518 opts="${opts} -s ${eshell}"
600 519
601 # handle homedir 520 # handle homedir
602 local ehome="$1"; shift 521 local ehome=$1; shift
603 if [ -z "${ehome}" ] && [ "${eshell}" != "-1" ] 522 if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then
604 then
605 ehome="/dev/null" 523 ehome="/dev/null"
606 fi 524 fi
607 einfo " - Home: ${ehome}" 525 einfo " - Home: ${ehome}"
608 opts="${opts} -d ${ehome}" 526 opts="${opts} -d ${ehome}"
609 527
610 # handle groups 528 # handle groups
611 local egroups="$1"; shift 529 local egroups=$1; shift
612 if [ ! -z "${egroups}" ] 530 if [[ ! -z ${egroups} ]] ; then
613 then
614 local oldifs="${IFS}" 531 local oldifs=${IFS}
615 local defgroup="" exgroups="" 532 local defgroup="" exgroups=""
616 533
617 export IFS="," 534 export IFS=","
618 for g in ${egroups} 535 for g in ${egroups} ; do
619 do
620 export IFS="${oldifs}" 536 export IFS=${oldifs}
621 if [ -z "`egetent group \"${g}\"`" ] 537 if [[ -z $(egetent group "${g}") ]] ; then
622 then
623 eerror "You must add group ${g} to the system first" 538 eerror "You must add group ${g} to the system first"
624 die "${g} is not a valid GID" 539 die "${g} is not a valid GID"
625 fi 540 fi
626 if [ -z "${defgroup}" ] 541 if [[ -z ${defgroup} ]] ; then
627 then
628 defgroup="${g}" 542 defgroup=${g}
629 else 543 else
630 exgroups="${exgroups},${g}" 544 exgroups="${exgroups},${g}"
631 fi 545 fi
632 export IFS="," 546 export IFS=","
633 done 547 done
634 export IFS="${oldifs}" 548 export IFS=${oldifs}
635 549
636 opts="${opts} -g ${defgroup}" 550 opts="${opts} -g ${defgroup}"
637 if [ ! -z "${exgroups}" ] 551 if [[ ! -z ${exgroups} ]] ; then
638 then
639 opts="${opts} -G ${exgroups:1}" 552 opts="${opts} -G ${exgroups:1}"
640 fi 553 fi
641 else 554 else
642 egroups="(none)" 555 egroups="(none)"
643 fi 556 fi
644 einfo " - Groups: ${egroups}" 557 einfo " - Groups: ${egroups}"
645 558
646 # handle extra and add the user 559 # handle extra and add the user
647 local eextra="$@"
648 local oldsandbox="${SANDBOX_ON}" 560 local oldsandbox=${SANDBOX_ON}
649 export SANDBOX_ON="0" 561 export SANDBOX_ON="0"
650 if useq ppc-macos 562 case ${CHOST} in
651 then 563 *-darwin*)
652 ### Make the user 564 ### Make the user
653 if [ -z "${eextra}" ] 565 if [[ -z $@ ]] ; then
654 then
655 dscl . create /users/${euser} uid ${euid} 566 dscl . create /users/${euser} uid ${euid}
656 dscl . create /users/${euser} shell ${eshell} 567 dscl . create /users/${euser} shell ${eshell}
657 dscl . create /users/${euser} home ${ehome} 568 dscl . create /users/${euser} home ${ehome}
658 dscl . create /users/${euser} realname "added by portage for ${PN}" 569 dscl . create /users/${euser} realname "added by portage for ${PN}"
659 ### Add the user to the groups specified 570 ### Add the user to the groups specified
660 local oldifs="${IFS}" 571 local oldifs=${IFS}
661 export IFS="," 572 export IFS=","
662 for g in ${egroups} 573 for g in ${egroups} ; do
663 do
664 dscl . merge /groups/${g} users ${euser} 574 dscl . merge /groups/${g} users ${euser}
665 done 575 done
666 export IFS="${oldifs}" 576 export IFS=${oldifs}
667 else 577 else
668 einfo "Extra options are not supported on macos yet" 578 einfo "Extra options are not supported on Darwin yet"
669 einfo "Please report the ebuild along with the info below" 579 einfo "Please report the ebuild along with the info below"
670 einfo "eextra: ${eextra}" 580 einfo "eextra: $@"
671 die "Required function missing" 581 die "Required function missing"
672 fi 582 fi
673 elif use x86-fbsd ; then 583 ;;
674 if [ -z "${eextra}" ] 584 *-freebsd*|*-dragonfly*)
675 then 585 if [[ -z $@ ]] ; then
676 pw useradd ${euser} ${opts} \ 586 pw useradd ${euser} ${opts} \
677 -c "added by portage for ${PN}" \ 587 -c "added by portage for ${PN}" \
678 die "enewuser failed" 588 die "enewuser failed"
679 else 589 else
680 einfo " - Extra: ${eextra}" 590 einfo " - Extra: $@"
681 pw useradd ${euser} ${opts} \ 591 pw useradd ${euser} ${opts} \
682 -c ${eextra} || die "enewuser failed" 592 "$@" || die "enewuser failed"
683 fi 593 fi
594 ;;
595
596 *-netbsd*)
597 if [[ -z $@ ]] ; then
598 useradd ${opts} ${euser} || die "enewuser failed"
684 else 599 else
685 if [ -z "${eextra}" ] 600 einfo " - Extra: $@"
686 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
687 useradd ${opts} ${euser} \ 620 useradd ${opts} ${euser} \
688 -c "added by portage for ${PN}" \ 621 -c "added by portage for ${PN}" \
689 || die "enewuser failed" 622 || die "enewuser failed"
690 else 623 else
691 einfo " - Extra: ${eextra}" 624 einfo " - Extra: $@"
692 useradd ${opts} ${euser} ${eextra} \ 625 useradd ${opts} ${euser} "$@" \
693 || die "enewuser failed" 626 || die "enewuser failed"
694 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}"
695 fi 636 fi
637
696 export SANDBOX_ON="${oldsandbox}" 638 export SANDBOX_ON=${oldsandbox}
697
698 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ]
699 then
700 einfo " - Creating ${ehome} in ${D}"
701 dodir ${ehome}
702 fowners ${euser} ${ehome}
703 fperms 755 ${ehome}
704 fi
705} 639}
706 640
707# Simplify/standardize adding groups to the system 641# Simplify/standardize adding groups to the system
708# vapier@gentoo.org 642# vapier@gentoo.org
709# 643#
712# Default values if you do not specify any: 646# Default values if you do not specify any:
713# groupname: REQUIRED ! 647# groupname: REQUIRED !
714# gid: next available (see groupadd(8)) 648# gid: next available (see groupadd(8))
715# extra: none 649# extra: none
716enewgroup() { 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
717 # get the group 658 # get the group
718 local egroup="$1"; shift 659 local egroup="$1"; shift
719 if [ -z "${egroup}" ] 660 if [ -z "${egroup}" ]
720 then 661 then
721 eerror "No group specified !" 662 eerror "No group specified !"
722 die "Cannot call enewgroup without a group" 663 die "Cannot call enewgroup without a group"
723 fi 664 fi
724 665
725 # see if group already exists 666 # see if group already exists
726 if [ "${egroup}" == "`egetent group \"${egroup}\" | cut -d: -f1`" ] 667 if [[ -n $(egetent group "${egroup}") ]]; then
727 then
728 return 0 668 return 0
729 fi 669 fi
730 einfo "Adding group '${egroup}' to your system ..." 670 einfo "Adding group '${egroup}' to your system ..."
731 671
732 # options to pass to useradd 672 # options to pass to useradd
738 then 678 then
739 if [ "${egid}" -gt 0 ] 679 if [ "${egid}" -gt 0 ]
740 then 680 then
741 if [ -z "`egetent group ${egid}`" ] 681 if [ -z "`egetent group ${egid}`" ]
742 then 682 then
743 if useq ppc-macos ; then 683 if [[ "${CHOST}" == *-darwin* ]]; then
744 opts="${opts} ${egid}" 684 opts="${opts} ${egid}"
745 else 685 else
746 opts="${opts} -g ${egid}" 686 opts="${opts} -g ${egid}"
747 fi 687 fi
748 else 688 else
762 opts="${opts} ${eextra}" 702 opts="${opts} ${eextra}"
763 703
764 # add the group 704 # add the group
765 local oldsandbox="${SANDBOX_ON}" 705 local oldsandbox="${SANDBOX_ON}"
766 export SANDBOX_ON="0" 706 export SANDBOX_ON="0"
767 if useq ppc-macos ; then 707 case ${CHOST} in
708 *-darwin*)
768 if [ ! -z "${eextra}" ]; 709 if [ ! -z "${eextra}" ];
769 then 710 then
770 einfo "Extra options are not supported on macos yet" 711 einfo "Extra options are not supported on Darwin/OS X yet"
771 einfo "Please report the ebuild along with the info below" 712 einfo "Please report the ebuild along with the info below"
772 einfo "eextra: ${eextra}" 713 einfo "eextra: ${eextra}"
773 die "Required function missing" 714 die "Required function missing"
774 fi 715 fi
775 716
776 # If we need the next available 717 # If we need the next available
777 case ${egid} in 718 case ${egid} in
778 *[!0-9]*) # Non numeric 719 *[!0-9]*) # Non numeric
779 for egid in `jot 898 101`; do 720 for ((egid = 101; egid <= 999; egid++)); do
780 [ -z "`egetent group ${egid}`" ] && break 721 [[ -z $(egetent group ${egid}) ]] && break
781 done 722 done
782 esac 723 esac
783 dscl . create /groups/${egroup} gid ${egid} 724 dscl . create /groups/${egroup} gid ${egid}
784 dscl . create /groups/${egroup} passwd '*' 725 dscl . create /groups/${egroup} passwd '*'
785 elif use x86-fbsd ; then 726 ;;
727
728 *-freebsd*|*-dragonfly*)
786 case ${egid} in 729 case ${egid} in
787 *[!0-9]*) # Non numeric 730 *[!0-9]*) # Non numeric
788 for egid in `jot 898 101`; do 731 for ((egid = 101; egid <= 999; egid++)); do
789 [ -z "`egetent group ${egid}`" ] && break 732 [[ -z $(egetent group ${egid}) ]] && break
790 done 733 done
791 esac 734 esac
792 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 735 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
793 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 *)
794 groupadd ${opts} ${egroup} || die "enewgroup failed" 749 groupadd ${opts} ${egroup} || die "enewgroup failed"
795 fi 750 ;;
751 esac
796 export SANDBOX_ON="${oldsandbox}" 752 export SANDBOX_ON="${oldsandbox}"
797} 753}
798 754
799# Simple script to replace 'dos2unix' binaries 755# Simple script to replace 'dos2unix' binaries
800# vapier@gentoo.org 756# vapier@gentoo.org
801# 757#
802# edos2unix(file, <more files> ...) 758# edos2unix(file, <more files> ...)
803edos2unix() { 759edos2unix() {
804 for f in "$@" 760 echo "$@" | xargs sed -i 's/\r$//'
805 do
806 cp "${f}" ${T}/edos2unix
807 sed 's/\r$//' ${T}/edos2unix > "${f}"
808 done
809} 761}
810 762
811 763
812############################################################## 764##############################################################
813# START: Handle .desktop files and menu entries # 765# START: Handle .desktop files and menu entries #
814# maybe this should be separated into a new eclass some time # 766# maybe this should be separated into a new eclass some time #
815# lanius@gentoo.org # 767# lanius@gentoo.org #
816############################################################## 768##############################################################
817 769
818# Make a desktop file ! 770# Make a desktop file !
819# Great for making those icons in kde/gnome startmenu ! 771# Great for making those icons in kde/gnome startmenu !
820# Amaze your friends ! Get the women ! Join today ! 772# Amaze your friends ! Get the women ! Join today !
821# 773#
822# make_desktop_entry(<binary>, [name], [icon], [type], [path]) 774# make_desktop_entry(<command>, [name], [icon], [type], [path])
823# 775#
824# binary: what binary does the app run with ? 776# binary: what command does the app run with ?
825# name: the name that will show up in the menu 777# name: the name that will show up in the menu
826# icon: give your little like a pretty little icon ... 778# icon: give your little like a pretty little icon ...
827# this can be relative (to /usr/share/pixmaps) or 779# this can be relative (to /usr/share/pixmaps) or
828# a full path to an icon 780# a full path to an icon
829# type: what kind of application is this ? for categories: 781# type: what kind of application is this ? for categories:
830# http://www.freedesktop.org/wiki/Standards_2fmenu_2dspec 782# http://www.freedesktop.org/Standards/desktop-entry-spec
831# path: if your app needs to startup in a specific dir 783# path: if your app needs to startup in a specific dir
832make_desktop_entry() { 784make_desktop_entry() {
833 [[ -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
834 786
835 local exec=${1} 787 local exec=${1}
842 local catmaj=${CATEGORY%%-*} 794 local catmaj=${CATEGORY%%-*}
843 local catmin=${CATEGORY##*-} 795 local catmin=${CATEGORY##*-}
844 case ${catmaj} in 796 case ${catmaj} in
845 app) 797 app)
846 case ${catmin} in 798 case ${catmin} in
847 admin) type=System;; 799 admin) type=System;;
848 cdr) type=DiscBurning;; 800 cdr) type=DiscBurning;;
849 dicts) type=Dictionary;; 801 dicts) type=Dictionary;;
850 editors) type=TextEditor;; 802 editors) type=TextEditor;;
851 emacs) type=TextEditor;; 803 emacs) type=TextEditor;;
852 emulation) type=Emulator;; 804 emulation) type=Emulator;;
853 laptop) type=HardwareSettings;; 805 laptop) type=HardwareSettings;;
854 office) type=Office;; 806 office) type=Office;;
855 vim) type=TextEditor;; 807 vim) type=TextEditor;;
856 xemacs) type=TextEditor;; 808 xemacs) type=TextEditor;;
857 *) type=;; 809 *) type=;;
858 esac 810 esac
859 ;; 811 ;;
860 812
861 dev) 813 dev)
862 type="Development" 814 type="Development"
863 ;; 815 ;;
864 816
865 games) 817 games)
866 [[ -z ${path} ]] && path=${GAMES_BINDIR}
867
868 case ${catmin} in 818 case ${catmin} in
869 action) type=ActionGame;; 819 action|fps) type=ActionGame;;
870 arcade) type=ArcadeGame;; 820 arcade) type=ArcadeGame;;
871 board) type=BoardGame;; 821 board) type=BoardGame;;
872 kid) type=KidsGame;; 822 kids) type=KidsGame;;
873 emulation) type=Emulator;; 823 emulation) type=Emulator;;
874 puzzle) type=LogicGame;; 824 puzzle) type=LogicGame;;
875 rpg) type=RolePlaying;; 825 rpg) type=RolePlaying;;
876 roguelike) type=RolePlaying;; 826 roguelike) type=RolePlaying;;
877 simulation) type=Simulation;; 827 simulation) type=Simulation;;
878 sports) type=SportsGame;; 828 sports) type=SportsGame;;
879 strategy) type=StrategyGame;; 829 strategy) type=StrategyGame;;
880 *) type=;; 830 *) type=;;
881 esac 831 esac
882 type="Game;${type}" 832 type="Game;${type}"
883 ;; 833 ;;
884 834
885 mail) 835 mail)
889 media) 839 media)
890 case ${catmin} in 840 case ${catmin} in
891 gfx) type=Graphics;; 841 gfx) type=Graphics;;
892 radio) type=Tuner;; 842 radio) type=Tuner;;
893 sound) type=Audio;; 843 sound) type=Audio;;
894 tv) type=TV;; 844 tv) type=TV;;
895 video) type=Video;; 845 video) type=Video;;
896 *) type=;; 846 *) type=;;
897 esac 847 esac
898 type="AudioVideo;${type}" 848 type="AudioVideo;${type}"
899 ;; 849 ;;
900 850
901 net) 851 net)
902 case ${catmin} in 852 case ${catmin} in
903 dialup) type=Dialup;; 853 dialup) type=Dialup;;
904 ftp) type=FileTransfer;; 854 ftp) type=FileTransfer;;
905 im) type=InstantMessaging;; 855 im) type=InstantMessaging;;
906 irc) type=IRCClient;; 856 irc) type=IRCClient;;
907 mail) type=Email;; 857 mail) type=Email;;
908 news) type=News;; 858 news) type=News;;
909 nntp) type=News;; 859 nntp) type=News;;
910 p2p) type=FileTransfer;; 860 p2p) type=FileTransfer;;
911 *) type=;; 861 *) type=;;
912 esac 862 esac
913 type="Network;${type}" 863 type="Network;${type}"
914 ;; 864 ;;
915 865
916 sci) 866 sci)
917 case ${catmin} in 867 case ${catmin} in
918 astro*) type=Astronomoy;; 868 astro*) type=Astronomy;;
919 bio*) type=Biology;; 869 bio*) type=Biology;;
920 calc*) type=Calculator;; 870 calc*) type=Calculator;;
921 chem*) type=Chemistry;; 871 chem*) type=Chemistry;;
922 geo*) type=Geology;; 872 geo*) type=Geology;;
923 math*) type=Math;; 873 math*) type=Math;;
924 *) type=;; 874 *) type=;;
925 esac 875 esac
926 type="Science;${type}" 876 type="Science;${type}"
927 ;; 877 ;;
928 878
929 www) 879 www)
930 case ${catmin} in 880 case ${catmin} in
931 client) type=WebBrowser;; 881 client) type=WebBrowser;;
932 *) type=;; 882 *) type=;;
933 esac 883 esac
934 type="Network" 884 type="Network"
935 ;; 885 ;;
936 886
937 *) 887 *)
938 type= 888 type=
939 ;; 889 ;;
940 esac 890 esac
941 fi 891 fi
942 892 if [ "${SLOT}" == "0" ] ; then
893 local desktop_name="${PN}"
894 else
895 local desktop_name="${PN}-${SLOT}"
896 fi
943 local desktop=${T}/${exec%% *}-${P}.desktop 897 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
898# local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
944 899
945echo "[Desktop Entry] 900echo "[Desktop Entry]
946Encoding=UTF-8 901Encoding=UTF-8
947Version=0.9.2 902Version=0.9.2
948Name=${name} 903Name=${name}
949Type=Application 904Type=Application
950Comment=${DESCRIPTION} 905Comment=${DESCRIPTION}
951Exec=${exec} 906Exec=${exec}
907TryExec=${exec%% *}
952Path=${path} 908Path=${path}
953Icon=${icon} 909Icon=${icon}
954Categories=Application;${type};" > "${desktop}" 910Categories=Application;${type};" > "${desktop}"
955 911
912 (
913 # wrap the env here so that the 'insinto' call
914 # doesn't corrupt the env of the caller
956 insinto /usr/share/applications 915 insinto /usr/share/applications
957 doins "${desktop}" 916 doins "${desktop}"
958 917 )
959 return 0
960} 918}
961 919
962# Make a GDM/KDM Session file 920# Make a GDM/KDM Session file
963# 921#
964# make_desktop_entry(<title>, <command>) 922# make_session_desktop(<title>, <command>)
965# title: File to execute to start the Window Manager 923# title: File to execute to start the Window Manager
966# command: Name of the Window Manager 924# command: Name of the Window Manager
967 925
968make_session_desktop() { 926make_session_desktop() {
969 [[ -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
993 doins "${i}" 951 doins "${i}"
994 elif [[ -d ${i} ]] ; then 952 elif [[ -d ${i} ]] ; then
995 for j in "${i}"/*.desktop ; do 953 for j in "${i}"/*.desktop ; do
996 doins "${j}" 954 doins "${j}"
997 done 955 done
998 fi 956 fi
999 done 957 done
1000} 958}
1001newmenu() { 959newmenu() {
1002 insinto /usr/share/applications 960 insinto /usr/share/applications
1003 newins "$1" "$2" 961 newins "$1" "$2"
1011 doins "${i}" 969 doins "${i}"
1012 elif [[ -d ${i} ]] ; then 970 elif [[ -d ${i} ]] ; then
1013 for j in "${i}"/*.png ; do 971 for j in "${i}"/*.png ; do
1014 doins "${j}" 972 doins "${j}"
1015 done 973 done
1016 fi 974 fi
1017 done 975 done
1018} 976}
1019newicon() { 977newicon() {
1020 insinto /usr/share/pixmaps 978 insinto /usr/share/pixmaps
1021 newins "$1" "$2" 979 newins "$1" "$2"
1022} 980}
1023 981
1024############################################################## 982##############################################################
1025# END: Handle .desktop files and menu entries # 983# END: Handle .desktop files and menu entries #
1026############################################################## 984##############################################################
1027 985
1028 986
1029# for internal use only (unpack_pdv and unpack_makeself) 987# for internal use only (unpack_pdv and unpack_makeself)
1030find_unpackable_file() { 988find_unpackable_file() {
1031 local src="$1" 989 local src=$1
1032 if [ -z "${src}" ] 990 if [[ -z ${src} ]] ; then
1033 then
1034 src="${DISTDIR}/${A}" 991 src=${DISTDIR}/${A}
1035 else 992 else
1036 if [ -e "${DISTDIR}/${src}" ] 993 if [[ -e ${DISTDIR}/${src} ]] ; then
1037 then
1038 src="${DISTDIR}/${src}" 994 src=${DISTDIR}/${src}
1039 elif [ -e "${PWD}/${src}" ] 995 elif [[ -e ${PWD}/${src} ]] ; then
1040 then
1041 src="${PWD}/${src}" 996 src=${PWD}/${src}
1042 elif [ -e "${src}" ] 997 elif [[ -e ${src} ]] ; then
1043 then
1044 src="${src}" 998 src=${src}
1045 fi
1046 fi 999 fi
1047 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 1000 fi
1001 [[ ! -e ${src} ]] && return 1
1048 echo "${src}" 1002 echo "${src}"
1049} 1003}
1050 1004
1051# Unpack those pesky pdv generated files ... 1005# Unpack those pesky pdv generated files ...
1052# They're self-unpacking programs with the binary package stuffed in 1006# They're self-unpacking programs with the binary package stuffed in
1053# 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
1054# 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.
1055# 1009#
1056# Usage: unpack_pdv [file to unpack] [size of off_t] 1010# Usage: unpack_pdv [file to unpack] [size of off_t]
1057# - 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
1058# information out of the binary executable myself. basically you pass in 1012# information out of the binary executable myself. basically you pass in
1059# 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
1060# 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:
1061# strings <pdv archive> | grep lseek 1015# strings <pdv archive> | grep lseek
1062# strace -elseek <pdv archive> 1016# strace -elseek <pdv archive>
1063# 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
1064# 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
1065# parameter. here is an example: 1019# parameter. here is an example:
1066# root@vapier 0 pdv_unpack # strings hldsupdatetool.bin | grep lseek 1020# root@vapier 0 pdv_unpack # strings hldsupdatetool.bin | grep lseek
1067# lseek 1021# lseek
1068# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1022# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
1069# lseek(3, -4, SEEK_END) = 2981250 1023# lseek(3, -4, SEEK_END) = 2981250
1070# 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.
1071unpack_pdv() { 1025unpack_pdv() {
1072 local src="`find_unpackable_file $1`" 1026 local src=$(find_unpackable_file $1)
1073 local sizeoff_t="$2" 1027 local sizeoff_t=$2
1074 1028
1029 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1075 [ -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 :("
1076 1031
1077 local shrtsrc="`basename ${src}`" 1032 local shrtsrc=$(basename "${src}")
1078 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1033 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1079 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1034 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
1080 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\"`
1081 1036
1082 # grab metadata for debug reasons 1037 # grab metadata for debug reasons
1083 local metafile="$(emktemp)" 1038 local metafile="$(emktemp)"
1084 tail -c +$((${metaskip}+1)) ${src} > ${metafile} 1039 tail -c +$((${metaskip}+1)) ${src} > ${metafile}
1085 1040
1144# many other game companies. 1099# many other game companies.
1145# 1100#
1146# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1101# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1147# - If the file is not specified then unpack will utilize ${A}. 1102# - If the file is not specified then unpack will utilize ${A}.
1148# - 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
1149# the proper offset from the script itself. 1104# the proper offset from the script itself.
1150unpack_makeself() { 1105unpack_makeself() {
1106 local src_input=${1:-${A}}
1151 local src="$(find_unpackable_file "$1")" 1107 local src=$(find_unpackable_file "${src_input}")
1152 local skip="$2" 1108 local skip=$2
1153 local exe="$3" 1109 local exe=$3
1154 1110
1111 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1112
1155 local shrtsrc="$(basename "${src}")" 1113 local shrtsrc=$(basename "${src}")
1156 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1114 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1157 if [ -z "${skip}" ] 1115 if [[ -z ${skip} ]] ; then
1158 then
1159 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1116 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1160 local skip=0 1117 local skip=0
1161 exe=tail 1118 exe=tail
1162 case ${ver} in 1119 case ${ver} in
1163 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
1164 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1121 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1165 ;; 1122 ;;
1166 2.0|2.0.1) 1123 2.0|2.0.1)
1167 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-) 1124 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-)
1168 ;; 1125 ;;
1176 ;; 1133 ;;
1177 2.1.3) 1134 2.1.3)
1178 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1135 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1179 let skip="skip + 1" 1136 let skip="skip + 1"
1180 ;; 1137 ;;
1181 2.1.4) 1138 2.1.4|2.1.5)
1182 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)
1183 skip=$(head -n ${skip} "${src}" | wc -c) 1140 skip=$(head -n ${skip} "${src}" | wc -c)
1184 exe="dd" 1141 exe="dd"
1185 ;; 1142 ;;
1186 *) 1143 *)
1202 # 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
1203 local tmpfile="$(emktemp)" 1160 local tmpfile="$(emktemp)"
1204 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}" 1161 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}"
1205 local filetype="$(file -b "${tmpfile}")" 1162 local filetype="$(file -b "${tmpfile}")"
1206 case ${filetype} in 1163 case ${filetype} in
1207 *tar\ archive) 1164 *tar\ archive*)
1208 eval ${exe} | tar --no-same-owner -xf - 1165 eval ${exe} | tar --no-same-owner -xf -
1209 ;; 1166 ;;
1210 bzip2*) 1167 bzip2*)
1211 eval ${exe} | bzip2 -dc | tar --no-same-owner -xf - 1168 eval ${exe} | bzip2 -dc | tar --no-same-owner -xf -
1212 ;; 1169 ;;
1231check_license() { 1188check_license() {
1232 local lic=$1 1189 local lic=$1
1233 if [ -z "${lic}" ] ; then 1190 if [ -z "${lic}" ] ; then
1234 lic="${PORTDIR}/licenses/${LICENSE}" 1191 lic="${PORTDIR}/licenses/${LICENSE}"
1235 else 1192 else
1236 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1193 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1237 lic="${PORTDIR}/licenses/${src}" 1194 lic="${PORTDIR}/licenses/${lic}"
1238 elif [ -e "${PWD}/${src}" ] ; then 1195 elif [ -e "${PWD}/${lic}" ] ; then
1239 lic="${PWD}/${src}" 1196 lic="${PWD}/${lic}"
1240 elif [ -e "${src}" ] ; then 1197 elif [ -e "${lic}" ] ; then
1241 lic="${src}" 1198 lic="${lic}"
1242 fi
1243 fi 1199 fi
1200 fi
1244 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1201 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1245 local l="`basename ${lic}`" 1202 local l="`basename ${lic}`"
1246 1203
1247 # here is where we check for the licenses the user already 1204 # here is where we check for the licenses the user already
1248 # 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
1249 local shopts=$- 1206 local shopts=$-
1250 local alic 1207 local alic
1251 set -o noglob #so that bash doesn't expand "*" 1208 set -o noglob #so that bash doesn't expand "*"
1252 for alic in ${ACCEPT_LICENSE} ; do 1209 for alic in ${ACCEPT_LICENSE} ; do
1253 if [[ ${alic} == * || ${alic} == ${l} ]]; then 1210 if [[ ${alic} == ${l} ]]; then
1254 set +o noglob; set -${shopts} #reset old shell opts 1211 set +o noglob; set -${shopts} #reset old shell opts
1255 return 0 1212 return 0
1256 fi 1213 fi
1257 done 1214 done
1258 set +o noglob; set -$shopts #reset old shell opts 1215 set +o noglob; set -$shopts #reset old shell opts
1260 local licmsg="$(emktemp)" 1217 local licmsg="$(emktemp)"
1261 cat << EOF > ${licmsg} 1218 cat << EOF > ${licmsg}
1262********************************************************** 1219**********************************************************
1263The following license outlines the terms of use of this 1220The following license outlines the terms of use of this
1264package. You MUST accept this license for installation to 1221package. You MUST accept this license for installation to
1265continue. When you are done viewing, hit 'q'. If you 1222continue. When you are done viewing, hit 'q'. If you
1266CTRL+C out of this, the install will not run! 1223CTRL+C out of this, the install will not run!
1267********************************************************** 1224**********************************************************
1268 1225
1269EOF 1226EOF
1270 cat ${lic} >> ${licmsg} 1227 cat ${lic} >> ${licmsg}
1291# 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
1292# found at CDROM_ROOT. 1249# found at CDROM_ROOT.
1293# 1250#
1294# 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',
1295# 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
1296# 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_#
1297# 1258#
1298# 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.
1299# 1260#
1300# 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] [...]
1301# - 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
1302# 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
1303# the cdrom functions will handle 1264# the cdrom functions will handle
1304cdrom_get_cds() { 1265cdrom_get_cds() {
1305 # 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
1306 # the # of files they gave us 1267 # the # of files they gave us
1307 local cdcnt=0 1268 local cdcnt=0
1308 local f= 1269 local f=
1309 for f in "$@" ; do 1270 for f in "$@" ; do
1310 cdcnt=$((cdcnt + 1)) 1271 ((++cdcnt))
1311 export CDROM_CHECK_${cdcnt}="$f" 1272 export CDROM_CHECK_${cdcnt}="$f"
1312 done 1273 done
1313 export CDROM_TOTAL_CDS=${cdcnt} 1274 export CDROM_TOTAL_CDS=${cdcnt}
1314 export CDROM_CURRENT_CD=1 1275 export CDROM_CURRENT_CD=1
1315 1276
1316 # now we see if the user gave use CD_ROOT ... 1277 # now we see if the user gave use CD_ROOT ...
1317 # 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
1318 if [[ ! -z ${CD_ROOT} ]] ; then
1319 export CDROM_ROOT=${CD_ROOT}
1320 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1321 return
1322 fi
1323 # do the same for CD_ROOT_X
1324 if [[ ! -z ${CD_ROOT_1} ]] ; then 1279 if [[ -n ${CD_ROOT}${CD_ROOT_1} ]] ; then
1325 local var= 1280 local var=
1326 cdcnt=0 1281 cdcnt=0
1327 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1282 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1328 cdcnt=$((cdcnt + 1)) 1283 ((++cdcnt))
1329 var="CD_ROOT_${cdcnt}" 1284 var="CD_ROOT_${cdcnt}"
1285 [[ -z ${!var} ]] && var="CD_ROOT"
1330 if [[ -z ${!var} ]] ; then 1286 if [[ -z ${!var} ]] ; then
1331 eerror "You must either use just the CD_ROOT" 1287 eerror "You must either use just the CD_ROOT"
1332 eerror "or specify ALL the CD_ROOT_X variables." 1288 eerror "or specify ALL the CD_ROOT_X variables."
1333 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."
1334 die "could not locate CD_ROOT_${cdcnt}" 1290 die "could not locate CD_ROOT_${cdcnt}"
1335 fi 1291 fi
1336 export CDROM_ROOTS_${cdcnt}="${!var}"
1337 done 1292 done
1338 export CDROM_ROOT=${CDROM_ROOTS_1} 1293 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1339 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}
1340 return 1301 return
1341 fi 1302 fi
1342 1303
1304 # User didn't help us out so lets make sure they know they can
1305 # simplify the whole process ...
1343 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1306 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1344 einfon "This ebuild will need the " 1307 einfo "This ebuild will need the ${CDROM_NAME:-cdrom for ${PN}}"
1345 if [[ -z ${CDROM_NAME} ]] ; then
1346 echo "cdrom for ${PN}."
1347 else
1348 echo "${CDROM_NAME}."
1349 fi
1350 echo 1308 echo
1351 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"
1352 einfo "mounted somewhere on your filesystem, just export" 1310 einfo "mounted somewhere on your filesystem, just export"
1353 einfo "the variable CD_ROOT so that it points to the" 1311 einfo "the variable CD_ROOT so that it points to the"
1354 einfo "directory containing the files." 1312 einfo "directory containing the files."
1355 echo 1313 echo
1356 einfo "For example:" 1314 einfo "For example:"
1357 einfo "export CD_ROOT=/mnt/cdrom" 1315 einfo "export CD_ROOT=/mnt/cdrom"
1358 echo 1316 echo
1359 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
1360 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1327 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1361 cdcnt=0 1328 cdcnt=0
1362 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1329 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1363 cdcnt=$((cdcnt + 1)) 1330 ((++cdcnt))
1364 var="CDROM_NAME_${cdcnt}" 1331 var="CDROM_NAME_${cdcnt}"
1365 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}" 1332 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1366 done 1333 done
1367 echo 1334 echo
1368 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"
1369 einfo "mounted somewhere on your filesystem, just export" 1336 einfo "mounted somewhere on your filesystem, just export"
1370 einfo "the following variables so they point to the right place:" 1337 einfo "the following variables so they point to the right place:"
1371 einfon "" 1338 einfon ""
1372 cdcnt=0 1339 cdcnt=0
1373 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1340 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1374 cdcnt=$((cdcnt + 1)) 1341 ((++cdcnt))
1375 echo -n " CD_ROOT_${cdcnt}" 1342 echo -n " CD_ROOT_${cdcnt}"
1376 done 1343 done
1377 echo 1344 echo
1378 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"
1379 einfo "you only have one cdrom, you can export CD_ROOT" 1346 einfo "you only have one cdrom, you can export CD_ROOT"
1382 echo 1349 echo
1383 einfo "For example:" 1350 einfo "For example:"
1384 einfo "export CD_ROOT_1=/mnt/cdrom" 1351 einfo "export CD_ROOT_1=/mnt/cdrom"
1385 echo 1352 echo
1386 fi 1353 fi
1354
1355 export CDROM_SET=""
1387 export CDROM_CURRENT_CD=0 1356 export CDROM_CURRENT_CD=0
1388 cdrom_load_next_cd 1357 cdrom_load_next_cd
1389} 1358}
1390 1359
1391# 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.
1392# 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.
1393# 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.
1394# 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.
1395cdrom_load_next_cd() { 1364cdrom_load_next_cd() {
1396 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1397 local var= 1365 local var
1398 1366 ((++CDROM_CURRENT_CD))
1399 if [[ ! -z ${CD_ROOT} ]] ; then
1400 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1401 return
1402 fi
1403 1367
1404 unset CDROM_ROOT 1368 unset CDROM_ROOT
1405 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1369 var=CD_ROOT_${CDROM_CURRENT_CD}
1370 [[ -z ${!var} ]] && var="CD_ROOT"
1406 if [[ -z ${!var} ]] ; then 1371 if [[ -z ${!var} ]] ; then
1407 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1372 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1408 cdrom_locate_file_on_cd ${!var} 1373 _cdrom_locate_file_on_cd ${!var}
1409 else 1374 else
1410 export CDROM_ROOT=${!var} 1375 export CDROM_ROOT=${!var}
1411 fi 1376 fi
1412 1377
1413 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1378 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1418# 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
1419# 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
1420# displayed and we'll hang out here until: 1385# displayed and we'll hang out here until:
1421# (1) the file is found on a mounted cdrom 1386# (1) the file is found on a mounted cdrom
1422# (2) the user hits CTRL+C 1387# (2) the user hits CTRL+C
1423cdrom_locate_file_on_cd() { 1388_cdrom_locate_file_on_cd() {
1389 local mline=""
1390 local showedmsg=0
1391
1424 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
1425 local dir="$(dirname ${@})" 1400 local dir=$(dirname ${cdset[${i}]})
1426 local file="$(basename ${@})" 1401 local file=$(basename ${cdset[${i}]})
1427 local mline=""
1428 local showedmsg=0
1429 1402
1430 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1403 local point= node= fs= foo=
1431 [[ -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/ }
1432 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \ 1409 [[ -z $(find "${point}/${dir}" -maxdepth 1 -iname "${file}") ]] && continue
1433 && 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))
1434 done 1417 done
1435 1418
1436 if [[ -z ${CDROM_ROOT} ]] ; then
1437 echo 1419 echo
1438 if [[ ${showedmsg} -eq 0 ]] ; then 1420 if [[ ${showedmsg} -eq 0 ]] ; then
1439 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1421 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1440 if [[ -z ${CDROM_NAME} ]] ; then 1422 if [[ -z ${CDROM_NAME} ]] ; then
1441 einfo "Please insert the cdrom for ${PN} now !" 1423 einfo "Please insert+mount the cdrom for ${PN} now !"
1442 else
1443 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1444 fi
1445 else 1424 else
1446 if [[ -z ${CDROM_NAME_1} ]] ; then
1447 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1448 else
1449 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1450 einfo "Please insert+mount the ${!var} cdrom now !" 1425 einfo "Please insert+mount the ${CDROM_NAME} cdrom now !"
1451 fi
1452 fi 1426 fi
1453 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
1454 fi 1434 fi
1435 showedmsg=1
1436 fi
1455 einfo "Press return to scan for the cd again" 1437 einfo "Press return to scan for the cd again"
1456 einfo "or hit CTRL+C to abort the emerge." 1438 einfo "or hit CTRL+C to abort the emerge."
1457 read 1439 echo
1458 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"
1459 done 1445 done
1460} 1446}
1461 1447
1462# Make sure that LINGUAS only contains languages that 1448# Make sure that LINGUAS only contains languages that
1463# a package can support 1449# a package can support
1464# 1450#
1465# usage: strip-linguas <allow LINGUAS> 1451# usage: strip-linguas <allow LINGUAS>
1466# strip-linguas -i <directories of .po files> 1452# strip-linguas -i <directories of .po files>
1467# strip-linguas -u <directories of .po files> 1453# strip-linguas -u <directories of .po files>
1468# 1454#
1469# The first form allows you to specify a list of LINGUAS. 1455# The first form allows you to specify a list of LINGUAS.
1470# 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
1471# directories and uses the intersection of the lists. 1457# directories and uses the intersection of the lists.
1472# 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
1473# directories and uses the union of the lists. 1459# directories and uses the union of the lists.
1474strip-linguas() { 1460strip-linguas() {
1475 local ls newls 1461 local ls newls nols
1476 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then 1462 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1477 local op=$1; shift 1463 local op=$1; shift
1478 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1464 ls=$(find "$1" -name '*.po' -exec basename {} .po \;); shift
1479 local d f 1465 local d f
1480 for d in "$@" ; do 1466 for d in "$@" ; do
1481 if [[ ${op} == "-u" ]] ; then 1467 if [[ ${op} == "-u" ]] ; then
1482 newls=${ls} 1468 newls=${ls}
1483 else 1469 else
1484 newls="" 1470 newls=""
1485 fi 1471 fi
1486 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1472 for f in $(find "$d" -name '*.po' -exec basename {} .po \;) ; do
1487 if [[ ${op} == "-i" ]] ; then 1473 if [[ ${op} == "-i" ]] ; then
1488 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}" 1474 hasq ${f} ${ls} && newls="${newls} ${f}"
1489 else 1475 else
1490 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}" 1476 hasq ${f} ${ls} || newls="${newls} ${f}"
1491 fi 1477 fi
1492 done 1478 done
1493 ls=${newls} 1479 ls=${newls}
1494 done 1480 done
1495 ls=${ls//.po}
1496 else 1481 else
1497 ls=$@ 1482 ls="$@"
1498 fi 1483 fi
1499 1484
1500 ls=" ${ls} " 1485 nols=""
1501 newls="" 1486 newls=""
1502 for f in ${LINGUAS} ; do 1487 for f in ${LINGUAS} ; do
1503 if [[ ${ls/ ${f} /} != ${ls} ]] ; then 1488 if hasq ${f} ${ls} ; then
1504 newls="${newls} ${f}" 1489 newls="${newls} ${f}"
1505 else 1490 else
1506 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1491 nols="${nols} ${f}"
1507 fi 1492 fi
1508 done 1493 done
1509 if [[ -z ${newls} ]] ; then 1494 [[ -n ${nols} ]] \
1510 export LINGUAS="" 1495 && ewarn "Sorry, but ${PN} does not support the LINGUAs:" ${nols}
1511 else
1512 export LINGUAS=${newls:1} 1496 export LINGUAS=${newls:1}
1513 fi
1514} 1497}
1515 1498
1516# moved from kernel.eclass since they are generally useful outside of 1499# moved from kernel.eclass since they are generally useful outside of
1517# kernel.eclass -iggy (20041002) 1500# kernel.eclass -iggy (20041002)
1518 1501
1530 x86) export ARCH="i386";; 1513 x86) export ARCH="i386";;
1531 amd64) export ARCH="x86_64";; 1514 amd64) export ARCH="x86_64";;
1532 hppa) export ARCH="parisc";; 1515 hppa) export ARCH="parisc";;
1533 mips) export ARCH="mips";; 1516 mips) export ARCH="mips";;
1534 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!
1535 *) export ARCH="${ARCH}";; 1518 *) export ARCH="${ARCH}";;
1536 esac 1519 esac
1537} 1520}
1538 1521
1539# set's ARCH back to what portage expects 1522# set's ARCH back to what portage expects
1540set_arch_to_portage() { 1523set_arch_to_portage() {
1547 1530
1548# Jeremy Huddleston <eradicator@gentoo.org>: 1531# Jeremy Huddleston <eradicator@gentoo.org>:
1549# preserve_old_lib /path/to/libblah.so.0 1532# preserve_old_lib /path/to/libblah.so.0
1550# preserve_old_lib_notify /path/to/libblah.so.0 1533# preserve_old_lib_notify /path/to/libblah.so.0
1551# 1534#
1552# 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
1553# 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
1554# 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
1555# 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
1556# solution, so instead you can add the following to your ebuilds: 1539# solution, so instead you can add the following to your ebuilds:
1557# 1540#
1558# src_install() { 1541# pkg_preinst() {
1559# ... 1542# ...
1560# preserve_old_lib /usr/$(get_libdir)/libogg.so.0 1543# preserve_old_lib /usr/$(get_libdir)/libogg.so.0
1561# ... 1544# ...
1562# } 1545# }
1563# 1546#
1566# preserve_old_lib_notify /usr/$(get_libdir)/libogg.so.0 1549# preserve_old_lib_notify /usr/$(get_libdir)/libogg.so.0
1567# ... 1550# ...
1568# } 1551# }
1569 1552
1570preserve_old_lib() { 1553preserve_old_lib() {
1571 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]"
1572 1559
1573 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1560 local lib dir
1574 SONAME=`basename ${LIB}` 1561 for lib in "$@" ; do
1575 DIRNAME=`dirname ${LIB}` 1562 [[ -e ${ROOT}/${lib} ]] || continue
1576 1563 dir=${lib%/*}
1577 dodir ${DIRNAME} 1564 dodir ${dir} || die "dodir ${dir} failed"
1578 cp ${ROOT}${LIB} ${D}${DIRNAME} 1565 cp "${ROOT}"/${lib} "${D}"/${lib} || die "cp ${lib} failed"
1579 touch ${D}${LIB} 1566 touch "${D}"/${lib}
1580 fi 1567 done
1581} 1568}
1582 1569
1583preserve_old_lib_notify() { 1570preserve_old_lib_notify() {
1584 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
1585 1575
1586 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1576 local lib notice=0
1587 SONAME=`basename ${LIB}` 1577 for lib in "$@" ; do
1588 1578 [[ -e ${ROOT}/${lib} ]] || continue
1579 if [[ ${notice} -eq 0 ]] ; then
1580 notice=1
1589 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."
1590 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,"
1591 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"
1592 einfo "you will need to execute the following command:" 1584 ewarn "in order to remove these old dependencies. If you do not have this"
1593 einfo " revdep-rebuild --soname ${SONAME}" 1585 ewarn "helper program, simply emerge the 'gentoolkit' package."
1594 einfo 1586 ewarn
1595 einfo "After doing that, you can safely remove ${LIB}"
1596 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild"
1597 fi 1587 fi
1588 ewarn " # revdep-rebuild --library ${lib##*/}"
1589 done
1598} 1590}
1599 1591
1600# 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
1601# certain USE flags 1593# certain USE flags
1602# 1594#
1603# 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>
1604# ex: built_with_use xchat gtk2 1596# ex: built_with_use xchat gtk2
1605# 1597#
1606# Flags: -a all USE flags should be utilized 1598# Flags: -a all USE flags should be utilized
1607# -o at least one USE flag should be utilized 1599# -o at least one USE flag should be utilized
1608# Note: the default flag is '-a' 1600# Note: the default flag is '-a'
1609built_with_use() { 1601built_with_use() {
1610 local opt=$1 1602 local opt=$1
1611 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1603 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1612 1604
1613 local PKG=$(best_version $1) 1605 local PKG=$(best_version $1)
1606 [[ -z ${PKG} ]] && die "Unable to resolve $1 to an installed package"
1614 shift 1607 shift
1615 1608
1616 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE" 1609 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
1617 [[ ! -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
1618 1628
1619 local USE_BUILT=$(<${USEFILE}) 1629 local USE_BUILT=$(<${USEFILE})
1620 while [[ $# -gt 0 ]] ; do 1630 while [[ $# -gt 0 ]] ; do
1621 if [[ ${opt} = "-o" ]] ; then 1631 if [[ ${opt} = "-o" ]] ; then
1622 has $1 ${USE_BUILT} && return 0 1632 has $1 ${USE_BUILT} && return 0
1637 local f 1647 local f
1638 for f in $(find ${dir} -name configure) ; do 1648 for f in $(find ${dir} -name configure) ; do
1639 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
1640 done 1650 done
1641 eend 0 1651 eend 0
1642}
1643
1644# dopamd <file> [more files]
1645#
1646# Install pam auth config file in /etc/pam.d
1647dopamd() {
1648 [[ -z $1 ]] && die "dopamd requires at least one argument"
1649
1650 use pam || return 0
1651
1652 INSDESTTREE=/etc/pam.d \
1653 doins "$@" || die "failed to install $@"
1654}
1655# newpamd <old name> <new name>
1656#
1657# Install pam file <old name> as <new name> in /etc/pam.d
1658newpamd() {
1659 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1660
1661 use pam || return 0
1662
1663 INSDESTTREE=/etc/pam.d \
1664 newins "$1" "$2" || die "failed to install $1 as $2"
1665} 1652}
1666 1653
1667# make a wrapper script ... 1654# make a wrapper script ...
1668# 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
1669# 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
1674# $4 == extra LD_LIBRARY_PATH's (make it : delimited) 1661# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1675# $5 == path for wrapper 1662# $5 == path for wrapper
1676make_wrapper() { 1663make_wrapper() {
1677 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5 1664 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1678 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"
1679 cat << EOF > "${tmpwrapper}" 1668 cat << EOF > "${tmpwrapper}"
1680#!/bin/sh 1669#!/bin/sh
1681cd "${chdir}" 1670cd "${chdir:-.}"
1671if [ -n "${libdir}" ] ; then
1672 if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
1682export 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
1683exec ${bin} "\$@" 1678exec ${bin} "\$@"
1684EOF 1679EOF
1685 chmod go+rx "${tmpwrapper}" 1680 chmod go+rx "${tmpwrapper}"
1686 if [ -n "${5}" ] 1681 if [[ -n ${path} ]] ; then
1687 then
1688 exeinto ${5} 1682 exeinto "${path}"
1689 newexe "${tmpwrapper}" "${wrapper}" 1683 newexe "${tmpwrapper}" "${wrapper}"
1690 else 1684 else
1691 newbin "${tmpwrapper}" "${wrapper}" 1685 newbin "${tmpwrapper}" "${wrapper}"
1692 fi 1686 fi
1693} 1687}

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

  ViewVC Help
Powered by ViewVC 1.1.20