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

Diff of /eclass/eutils.eclass

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

Revision 1.148 Revision 1.228
1# Copyright 1999-2004 Gentoo Foundation 1# Copyright 1999-2005 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.148 2005/02/03 23:55:05 azarah Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.228 2006/03/10 23:24:21 vapier Exp $
4# 4#
5# Author: Martin Schlemmer <azarah@gentoo.org> 5# Author: Martin Schlemmer <azarah@gentoo.org>
6# 6#
7# This eclass is for general purpose functions that most ebuilds 7# This eclass is for general purpose functions that most ebuilds
8# have to implement themselves. 8# have to implement themselves.
9# 9#
10# NB: If you add anything, please comment it! 10# NB: If you add anything, please comment it!
11 11
12inherit multilib 12inherit multilib portability
13ECLASS=eutils
14INHERITED="$INHERITED $ECLASS"
15 13
16DEPEND="!bootstrap? ( sys-devel/patch )" 14DEPEND="!bootstrap? ( sys-devel/patch )"
15# sys-apps/shadow is needed for useradd, etc, bug #94745.
17 16
18DESCRIPTION="Based on the ${ECLASS} eclass" 17DESCRIPTION="Based on the ${ECLASS} eclass"
19
20# ecpu_check
21# Usage:
22#
23# ecpu_check array_of_cpu_flags
24#
25# array_of_cpu_flags - An array of cpu flags to check against USE flags
26#
27# Checks user USE related cpu flags against /proc/cpuinfo. If user enables a
28# cpu flag that is not supported in their processor flags, it will warn the
29# user if CROSSCOMPILE is not set to 1 ( because cross compile users are
30# obviously using different cpu flags than their own cpu ). Examples:
31#
32# CPU_FLAGS=(mmx mmx2 sse sse2)
33# ecpu_check CPU_FLAGS
34# Chris White <chriswhite@gentoo.org> (03 Feb 2005)
35
36ecpu_check() {
37 # Think about changing below to: if [ "${CROSSCOMPILE}" -ne 1 -a -e "/proc/cpuinfo" ]
38 # and dropping the else if you do not plan on adding anything to that
39 # empty block ....
40 # PS: also try to add some quoting, and consider rather using ${foo} than $foo ...
41 if [ $CROSSCOMPILE -eq 1 ] || [ ! -e /proc/cpuinfo ]
42 then
43 :
44 else
45 CPU_FLAGS=$1
46 USER_CPU=`grep "flags" /proc/cpuinfo`
47
48 for flags in `seq 1 ${#CPU_FLAGS[@]}`
49 do
50 if has ${CPU_FLAGS[$flags - 1]} $USER_CPU && ! has ${CPU_FLAGS[$flags - 1]} $USE
51 then
52 ewarn "Your system is ${CPU_FLAGS[$flags - 1]} capable but you don't have it enabled!"
53 ewarn "You might be cross compiling (in this case set CROSSCOMPILE to 1 to disable this warning."
54 fi
55
56 if ! has ${CPU_FLAGS[$flags - 1]} $USER_CPU && has ${CPU_FLAGS[$flags -1]} $USE
57 then
58 ewarn "You have ${CPU_FLAGS[$flags - 1]} support enabled but your processor doesn't"
59 ewarn "Seem to support it! You might be cross compiling or do not have /proc filesystem"
60 ewarn "enabled. If either is the case, set CROSSCOMPILE to 1 to disable this warning."
61 fi
62 done
63 fi
64}
65 18
66# Wait for the supplied number of seconds. If no argument is supplied, defaults 19# Wait for the supplied number of seconds. If no argument is supplied, defaults
67# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not 20# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not
68# outputting to a terminal, don't wait. For compatability purposes, the argument 21# outputting to a terminal, don't wait. For compatability purposes, the argument
69# must be an integer greater than zero. 22# must be an integer greater than zero.
107# to point to the latest version of the library present. 60# to point to the latest version of the library present.
108# 61#
109# <azarah@gentoo.org> (26 Oct 2002) 62# <azarah@gentoo.org> (26 Oct 2002)
110# 63#
111gen_usr_ldscript() { 64gen_usr_ldscript() {
112 local libdir="$(get_libdir)" 65 local lib libdir=$(get_libdir)
113 # Just make sure it exists 66 # Just make sure it exists
114 dodir /usr/${libdir} 67 dodir /usr/${libdir}
115 68
69 for lib in "${@}" ; do
116 cat > "${D}/usr/${libdir}/${1}" << END_LDSCRIPT 70 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT
117/* GNU ld script 71 /* GNU ld script
118 Because Gentoo have critical dynamic libraries 72 Since Gentoo has critical dynamic libraries
119 in /lib, and the static versions in /usr/lib, we 73 in /lib, and the static versions in /usr/lib,
120 need to have a "fake" dynamic lib in /usr/lib, 74 we need to have a "fake" dynamic lib in /usr/lib,
121 otherwise we run into linking problems. 75 otherwise we run into linking problems.
122 See bug #4411 on http://bugs.gentoo.org/ for 76
123 more info. */ 77 See bug http://bugs.gentoo.org/4411 for more info.
78 */
124GROUP ( /${libdir}/${1} ) 79 GROUP ( /${libdir}/${lib} )
125END_LDSCRIPT 80 END_LDSCRIPT
126 fperms a+x "/usr/${libdir}/${1}" 81 fperms a+x "/usr/${libdir}/${lib}" || die "could not change perms on ${lib}"
127}
128
129# Simple function to draw a line consisting of '=' the same length as $*
130#
131# <azarah@gentoo.org> (11 Nov 2002)
132#
133draw_line() {
134 local i=0
135 local str_length=""
136
137 # Handle calls that do not have args, or wc not being installed ...
138 if [ -z "$1" -o ! -x "$(which wc 2>/dev/null)" ]
139 then
140 echo "==============================================================="
141 return 0
142 fi
143
144 # Get the length of $*
145 str_length="$(echo -n "$*" | wc -m)"
146
147 while [ "$i" -lt "${str_length}" ]
148 do
149 echo -n "="
150
151 i=$((i + 1))
152 done 82 done
153
154 echo
155
156 return 0
157} 83}
84
158 85
159# Default directory where patches are located 86# Default directory where patches are located
160EPATCH_SOURCE="${WORKDIR}/patch" 87EPATCH_SOURCE="${WORKDIR}/patch"
161# Default extension for patches 88# Default extension for patches
162EPATCH_SUFFIX="patch.bz2" 89EPATCH_SUFFIX="patch.bz2"
163# Default options for patch 90# Default options for patch
164# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571 91# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571
165EPATCH_OPTS="-g0" 92# Set --no-backup-if-mismatch so we don't leave '.orig' files behind.
93EPATCH_OPTS="-g0 --no-backup-if-mismatch"
166# List of patches not to apply. Not this is only file names, 94# List of patches not to apply. Not this is only file names,
167# and not the full path .. 95# and not the full path ..
168EPATCH_EXCLUDE="" 96EPATCH_EXCLUDE=""
169# Change the printed message for a single patch. 97# Change the printed message for a single patch.
170EPATCH_SINGLE_MSG="" 98EPATCH_SINGLE_MSG=""
99# Change the printed message for multiple patches.
100EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..."
171# Force applying bulk patches even if not following the style: 101# Force applying bulk patches even if not following the style:
172# 102#
173# ??_${ARCH}_foo.${EPATCH_SUFFIX} 103# ??_${ARCH}_foo.${EPATCH_SUFFIX}
174# 104#
175EPATCH_FORCE="no" 105EPATCH_FORCE="no"
206# hand its a directory, it will set EPATCH_SOURCE to this. 136# hand its a directory, it will set EPATCH_SOURCE to this.
207# 137#
208# <azarah@gentoo.org> (10 Nov 2002) 138# <azarah@gentoo.org> (10 Nov 2002)
209# 139#
210epatch() { 140epatch() {
141 _epatch_draw_line() {
142 # this func produces a lot of pointless noise when debugging is turned on ...
143 local is_debug=0
144 [[ $- == *x* ]] && is_debug=1 && set +x
145
146 local i=0 str_length="" str_out=""
147
148 # Handle calls that do not have args, or wc not being installed ...
149 if [[ -z $1 ]] || ! type -p wc >/dev/null ; then
150 str_length=65
151 else
152 str_length=$(echo -n "$*" | wc -m)
153 fi
154
155 while ((i++ < ${str_length})) ; do
156 str_out="${str_out}="
157 done
158 echo ${str_out}
159
160 [[ ${is_debug} -eq 1 ]] && set -x
161 return 0
162 }
163 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; }
211 local PIPE_CMD="" 164 local PIPE_CMD=""
212 local STDERR_TARGET="${T}/$$.out" 165 local STDERR_TARGET="${T}/$$.out"
213 local PATCH_TARGET="${T}/$$.patch" 166 local PATCH_TARGET="${T}/$$.patch"
214 local PATCH_SUFFIX="" 167 local PATCH_SUFFIX=""
215 local SINGLE_PATCH="no" 168 local SINGLE_PATCH="no"
216 local x="" 169 local x=""
217 170
171 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
172
218 if [ "$#" -gt 1 ] 173 if [ "$#" -gt 1 ]
219 then 174 then
220 local m="" 175 local m=""
221 einfo "${#} patches to apply ..."
222 for m in "$@" ; do 176 for m in "$@" ; do
223 epatch "${m}" 177 epatch "${m}"
224 done 178 done
225 return 0 179 return 0
226 fi 180 fi
280 ;; 234 ;;
281 esac 235 esac
282 236
283 if [ "${SINGLE_PATCH}" = "no" ] 237 if [ "${SINGLE_PATCH}" = "no" ]
284 then 238 then
285 einfo "Applying various patches (bugfixes/updates) ..." 239 einfo "${EPATCH_MULTI_MSG}"
286 fi 240 fi
287 for x in ${EPATCH_SOURCE} 241 for x in ${EPATCH_SOURCE}
288 do 242 do
289 # New ARCH dependant patch naming scheme ... 243 # New ARCH dependant patch naming scheme ...
290 # 244 #
291 # ???_arch_foo.patch 245 # ???_arch_foo.patch
292 # 246 #
293 if [ -f ${x} ] && \ 247 if [ -f ${x} ] && \
294 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "`eval echo \$\{x/_${ARCH}_\}`" != "${x}" ] || \ 248 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "${x/_${ARCH}_}" != "${x}" ] || \
295 [ "${EPATCH_FORCE}" = "yes" ]) 249 [ "${EPATCH_FORCE}" = "yes" ])
296 then 250 then
297 local count=0 251 local count=0
298 local popts="${EPATCH_OPTS}" 252 local popts="${EPATCH_OPTS}"
253 local patchname=${x##*/}
299 254
300 if [ -n "${EPATCH_EXCLUDE}" ] 255 if [ -n "${EPATCH_EXCLUDE}" ]
301 then 256 then
302 if [ "`eval echo \$\{EPATCH_EXCLUDE/${x##*/}\}`" != "${EPATCH_EXCLUDE}" ] 257 if [ "${EPATCH_EXCLUDE/${patchname}}" != "${EPATCH_EXCLUDE}" ]
303 then 258 then
304 continue 259 continue
305 fi 260 fi
306 fi 261 fi
307 262
309 then 264 then
310 if [ -n "${EPATCH_SINGLE_MSG}" ] 265 if [ -n "${EPATCH_SINGLE_MSG}" ]
311 then 266 then
312 einfo "${EPATCH_SINGLE_MSG}" 267 einfo "${EPATCH_SINGLE_MSG}"
313 else 268 else
314 einfo "Applying ${x##*/} ..." 269 einfo "Applying ${patchname} ..."
315 fi 270 fi
316 else 271 else
317 einfo " ${x##*/} ..." 272 einfo " ${patchname} ..."
318 fi 273 fi
319 274
320 echo "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 275 echo "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
321 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 276 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
322 277
323 # Allow for prefix to differ ... im lazy, so shoot me :/ 278 # Allow for prefix to differ ... im lazy, so shoot me :/
324 while [ "${count}" -lt 5 ] 279 while [ "${count}" -lt 5 ]
325 do 280 do
326 # Generate some useful debug info ... 281 # Generate some useful debug info ...
327 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 282 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
328 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 283 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
329 284
330 if [ "${PATCH_SUFFIX}" != "patch" ] 285 if [ "${PATCH_SUFFIX}" != "patch" ]
331 then 286 then
332 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 287 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
333 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 288 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
334 else 289 else
335 PATCH_TARGET="${x}" 290 PATCH_TARGET="${x}"
336 fi 291 fi
337 292
338 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 293 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
339 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 294 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
340 295
341 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 296 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
342 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 297 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
343 298
344 if [ "${PATCH_SUFFIX}" != "patch" ] 299 if [ "${PATCH_SUFFIX}" != "patch" ]
345 then 300 then
346 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1 301 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
347 then 302 then
348 echo 303 echo
349 eerror "Could not extract patch!" 304 eerror "Could not extract patch!"
350 #die "Could not extract patch!" 305 #die "Could not extract patch!"
351 count=5 306 count=5
352 break 307 break
353 fi 308 fi
354 fi 309 fi
355 310
356 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1 311 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f ; _epatch_assert) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
357 then 312 then
358 draw_line "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 313 _epatch_draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
359 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 314 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
360 echo "ACTUALLY APPLYING ${x##*/} ..." >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 315 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
361 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 316 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
362 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 317 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
363 318
364 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 2>&1 319 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
320 _epatch_assert
365 321
366 if [ "$?" -ne 0 ] 322 if [ "$?" -ne 0 ]
367 then 323 then
368 cat ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 324 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
369 echo 325 echo
370 eerror "A dry-run of patch command succeeded, but actually" 326 eerror "A dry-run of patch command succeeded, but actually"
371 eerror "applying the patch failed!" 327 eerror "applying the patch failed!"
372 #die "Real world sux compared to the dreamworld!" 328 #die "Real world sux compared to the dreamworld!"
373 count=5 329 count=5
374 fi 330 fi
375 331
376 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 332 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
377 333
378 break 334 break
379 fi 335 fi
380 336
381 count=$((count + 1)) 337 count=$((count + 1))
387 fi 343 fi
388 344
389 if [ "${count}" -eq 5 ] 345 if [ "${count}" -eq 5 ]
390 then 346 then
391 echo 347 echo
392 eerror "Failed Patch: ${x##*/}!" 348 eerror "Failed Patch: ${patchname} !"
349 eerror " ( ${PATCH_TARGET} )"
393 eerror 350 eerror
394 eerror "Include in your bugreport the contents of:" 351 eerror "Include in your bugreport the contents of:"
395 eerror 352 eerror
396 eerror " ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}" 353 eerror " ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}"
397 echo 354 echo
398 die "Failed Patch: ${x##*/}!" 355 die "Failed Patch: ${patchname}!"
399 fi 356 fi
400 357
401 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 358 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
402 359
403 eend 0 360 eend 0
404 fi 361 fi
405 done 362 done
406 if [ "${SINGLE_PATCH}" = "no" ] 363 if [ "${SINGLE_PATCH}" = "no" ]
407 then 364 then
408 einfo "Done with patching" 365 einfo "Done with patching"
409 fi 366 fi
410} 367}
411 368
412# This function return true if we are using the NPTL pthreads
413# implementation.
414#
415# <azarah@gentoo.org> (06 March 2003)
416#
417have_NPTL() {
418 cat > ${T}/test-nptl.c <<-"END"
419 #define _XOPEN_SOURCE
420 #include <unistd.h>
421 #include <stdio.h>
422
423 int main()
424 {
425 char buf[255];
426 char *str = buf;
427
428 confstr(_CS_GNU_LIBPTHREAD_VERSION, str, 255);
429 if (NULL != str) {
430 printf("%s\n", str);
431 if (NULL != strstr(str, "NPTL"))
432 return 0;
433 }
434
435 return 1;
436 }
437 END
438
439 einfon "Checking for _CS_GNU_LIBPTHREAD_VERSION support in glibc ..."
440 if gcc -o ${T}/nptl ${T}/test-nptl.c &> /dev/null
441 then
442 echo "yes"
443 einfon "Checking what PTHREADS implementation we have ..."
444 if ${T}/nptl
445 then
446 return 0
447 else
448 return 1
449 fi
450 else
451 echo "no"
452 fi
453
454 return 1
455}
456
457# This function check how many cpu's are present, and then set
458# -j in MAKEOPTS accordingly.
459#
460# Thanks to nall <nall@gentoo.org> for this.
461#
462get_number_of_jobs() {
463 local jobs=0
464
465 if [ ! -r /proc/cpuinfo ]
466 then
467 return 1
468 fi
469
470 # This bit is from H?kan Wessberg <nacka-gentoo@refug.org>, bug #13565.
471 if [ "`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | wc -l`" -gt 0 ]
472 then
473 ADMINOPTS="`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | cut -d= -f2 | sed 's/\"//g'`"
474 ADMINPARAM="`echo ${ADMINOPTS} | gawk '{match($0, /-j *[0-9]*/, opt); print opt[0]}'`"
475 ADMINPARAM="${ADMINPARAM/-j}"
476 fi
477
478 export MAKEOPTS="`echo ${MAKEOPTS} | sed -e 's:-j *[0-9]*::g'`"
479
480 if [ "${ARCH}" = "amd64" -o "${ARCH}" = "x86" -o "${ARCH}" = "hppa" -o \
481 "${ARCH}" = "arm" -o "${ARCH}" = "mips" -o "${ARCH}" = "ia64" ]
482 then
483 # these archs will always have "[Pp]rocessor"
484 jobs="$((`grep -c ^[Pp]rocessor /proc/cpuinfo` * 2))"
485
486 elif [ "${ARCH}" = "sparc" -o "${ARCH}" = "sparc64" ]
487 then
488 # sparc always has "ncpus active"
489 jobs="$((`grep "^ncpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
490
491 elif [ "${ARCH}" = "alpha" ]
492 then
493 # alpha has "cpus active", but only when compiled with SMP
494 if [ "`grep -c "^cpus active" /proc/cpuinfo`" -eq 1 ]
495 then
496 jobs="$((`grep "^cpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
497 else
498 jobs=2
499 fi
500
501 elif [ "${ARCH}" = "ppc" -o "${ARCH}" = "ppc64" ]
502 then
503 # ppc has "processor", but only when compiled with SMP
504 if [ "`grep -c "^processor" /proc/cpuinfo`" -eq 1 ]
505 then
506 jobs="$((`grep -c ^processor /proc/cpuinfo` * 2))"
507 else
508 jobs=2
509 fi
510 elif [ "${ARCH}" = "s390" ]
511 then
512 # s390 has "# processors : "
513 jobs="$((`grep "^\# processors" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
514 else
515 jobs="$((`grep -c ^cpu /proc/cpuinfo` * 2))"
516 die "Unknown ARCH -- ${ARCH}!"
517 fi
518
519 # Make sure the number is valid ...
520 if [ "${jobs}" -lt 1 ]
521 then
522 jobs=1
523 fi
524
525 if [ -n "${ADMINPARAM}" ]
526 then
527 if [ "${jobs}" -gt "${ADMINPARAM}" ]
528 then
529 einfo "Setting make jobs to \"-j${ADMINPARAM}\" to ensure successful merge ..."
530 export MAKEOPTS="${MAKEOPTS} -j${ADMINPARAM}"
531 else
532 einfo "Setting make jobs to \"-j${jobs}\" to ensure successful merge ..."
533 export MAKEOPTS="${MAKEOPTS} -j${jobs}"
534 fi
535 fi
536}
537
538# Cheap replacement for when debianutils (and thus mktemp) 369# Cheap replacement for when debianutils (and thus mktemp)
539# does not exist on the users system 370# does not exist on the users system
540# vapier@gentoo.org 371# vapier@gentoo.org
541# 372#
542# Takes just 1 optional parameter (the directory to create tmpfile in) 373# Takes just 1 optional parameter (the directory to create tmpfile in)
543emktemp() { 374emktemp() {
544 local exe="touch" 375 local exe="touch"
545 [ "$1" == "-d" ] && exe="mkdir" && shift 376 [[ $1 == -d ]] && exe="mkdir" && shift
546 local topdir="$1" 377 local topdir=$1
547 378
548 if [ -z "${topdir}" ] 379 if [[ -z ${topdir} ]] ; then
549 then
550 [ -z "${T}" ] \ 380 [[ -z ${T} ]] \
551 && topdir="/tmp" \ 381 && topdir="/tmp" \
552 || topdir="${T}" 382 || topdir=${T}
553 fi 383 fi
554 384
555 if [ -z "$(type -p mktemp)" ] 385 if [[ -z $(type -p mktemp) ]] ; then
556 then
557 local tmp=/ 386 local tmp=/
558 while [ -e "${tmp}" ] ; do 387 while [[ -e ${tmp} ]] ; do
559 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 388 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
560 done 389 done
561 ${exe} "${tmp}" 390 ${exe} "${tmp}" || ${exe} -p "${tmp}"
562 echo "${tmp}" 391 echo "${tmp}"
563 else 392 else
564 [ "${exe}" == "touch" ] \ 393 if [[ ${exe} == "touch" ]] ; then
565 && exe="-p" \ 394 [[ ${USERLAND} == "GNU" ]] \
566 || exe="-d" 395 && mktemp -p "${topdir}" \
567 mktemp ${exe} "${topdir}" 396 || TMPDIR="${topdir}" mktemp -t tmp
397 else
398 [[ ${USERLAND} == "GNU" ]] \
399 && mktemp -d "${topdir}" \
400 || TMPDIR="${topdir}" mktemp -dt tmp
401 fi
568 fi 402 fi
569} 403}
570 404
571# Small wrapper for getent (Linux), nidump (Mac OS X), 405# Small wrapper for getent (Linux), nidump (Mac OS X),
572# and pw (FreeBSD) used in enewuser()/enewgroup() 406# and pw (FreeBSD) used in enewuser()/enewgroup()
573# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 407# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
574# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 408# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
575# 409#
576# egetent(database, key) 410# egetent(database, key)
577egetent() { 411egetent() {
578 if useq ppc-macos ; then 412 case ${CHOST} in
413 *-darwin*)
579 case "$2" in 414 case "$2" in
580 *[!0-9]*) # Non numeric 415 *[!0-9]*) # Non numeric
581 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 416 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
582 ;; 417 ;;
583 *) # Numeric 418 *) # Numeric
584 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 419 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
585 ;; 420 ;;
586 esac 421 esac
587 elif useq x86-fbsd ; then 422 ;;
588 local action 423 *-freebsd*|*-dragonfly*)
589 if [ "$1" == "passwd" ] 424 local opts action="user"
590 then 425 [[ $1 == "passwd" ]] || action="group"
591 action="user" 426
592 else 427 # lookup by uid/gid
593 action="group" 428 if [[ $2 == [[:digit:]]* ]] ; then
429 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
594 fi 430 fi
431
595 pw show "${action}" "$2" -q 432 pw show ${action} ${opts} "$2" -q
596 else 433 ;;
434 *-netbsd*|*-openbsd*)
435 grep "$2:\*:" /etc/$1
436 ;;
437 *)
597 which nscd >& /dev/null && nscd -i "$1" 438 type -p nscd >& /dev/null && nscd -i "$1"
598 getent "$1" "$2" 439 getent "$1" "$2"
599 fi 440 ;;
441 esac
600} 442}
601 443
602# Simplify/standardize adding users to the system 444# Simplify/standardize adding users to the system
603# vapier@gentoo.org 445# vapier@gentoo.org
604# 446#
612# homedir: /dev/null 454# homedir: /dev/null
613# groups: none 455# groups: none
614# extra: comment of 'added by portage for ${PN}' 456# extra: comment of 'added by portage for ${PN}'
615enewuser() { 457enewuser() {
616 # get the username 458 # get the username
617 local euser="$1"; shift 459 local euser=$1; shift
618 if [ -z "${euser}" ] 460 if [[ -z ${euser} ]] ; then
619 then
620 eerror "No username specified !" 461 eerror "No username specified !"
621 die "Cannot call enewuser without a username" 462 die "Cannot call enewuser without a username"
622 fi 463 fi
623 464
624 # lets see if the username already exists 465 # lets see if the username already exists
625 if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ] 466 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then
626 then
627 return 0 467 return 0
628 fi 468 fi
629 einfo "Adding user '${euser}' to your system ..." 469 einfo "Adding user '${euser}' to your system ..."
630 470
631 # options to pass to useradd 471 # options to pass to useradd
632 local opts= 472 local opts=
633 473
634 # handle uid 474 # handle uid
635 local euid="$1"; shift 475 local euid=$1; shift
636 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] 476 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then
637 then
638 if [ "${euid}" -gt 0 ] 477 if [[ ${euid} -gt 0 ]] ; then
639 then
640 if [ ! -z "`egetent passwd ${euid}`" ] 478 if [[ ! -z $(egetent passwd ${euid}) ]] ; then
641 then
642 euid="next" 479 euid="next"
643 fi 480 fi
644 else 481 else
645 eerror "Userid given but is not greater than 0 !" 482 eerror "Userid given but is not greater than 0 !"
646 die "${euid} is not a valid UID" 483 die "${euid} is not a valid UID"
647 fi 484 fi
648 else 485 else
649 euid="next" 486 euid="next"
650 fi 487 fi
651 if [ "${euid}" == "next" ] 488 if [[ ${euid} == "next" ]] ; then
652 then 489 for euid in $(seq 101 999) ; do
653 local pwrange
654 if [ "${USERLAND}" == "BSD" ] ; then
655 pwrange="`jot 898 101`"
656 else
657 pwrange="`seq 101 999`"
658 fi
659 for euid in ${pwrange} ; do
660 [ -z "`egetent passwd ${euid}`" ] && break 490 [[ -z $(egetent passwd ${euid}) ]] && break
661 done 491 done
662 fi 492 fi
663 opts="${opts} -u ${euid}" 493 opts="${opts} -u ${euid}"
664 einfo " - Userid: ${euid}" 494 einfo " - Userid: ${euid}"
665 495
666 # handle shell 496 # handle shell
667 local eshell="$1"; shift 497 local eshell=$1; shift
668 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ] 498 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
669 then 499 if [[ ! -e ${ROOT}${eshell} ]] ; then
670 if [ ! -e "${eshell}" ]
671 then
672 eerror "A shell was specified but it does not exist !" 500 eerror "A shell was specified but it does not exist !"
673 die "${eshell} does not exist" 501 die "${eshell} does not exist in ${ROOT}"
674 fi 502 fi
675 else 503 if [[ ${eshell} == */false || ${eshell} == */nologin ]] ; then
676 if [ "${USERLAND}" == "BSD" ] 504 eerror "Do not specify ${eshell} yourself, use -1"
677 then 505 die "Pass '-1' as the shell parameter"
678 eshell="/usr/bin/false" 506 fi
679 else 507 else
680 eshell="/bin/false" 508 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
509 [[ -x ${ROOT}${shell} ]] && break
510 done
511
512 if [[ ${shell} == "/dev/null" ]] ; then
513 eerror "Unable to identify the shell to use"
514 die "Unable to identify the shell to use"
681 fi 515 fi
516
517 eshell=${shell}
682 fi 518 fi
683 einfo " - Shell: ${eshell}" 519 einfo " - Shell: ${eshell}"
684 opts="${opts} -s ${eshell}" 520 opts="${opts} -s ${eshell}"
685 521
686 # handle homedir 522 # handle homedir
687 local ehome="$1"; shift 523 local ehome=$1; shift
688 if [ -z "${ehome}" ] && [ "${eshell}" != "-1" ] 524 if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then
689 then
690 ehome="/dev/null" 525 ehome="/dev/null"
691 fi 526 fi
692 einfo " - Home: ${ehome}" 527 einfo " - Home: ${ehome}"
693 opts="${opts} -d ${ehome}" 528 opts="${opts} -d ${ehome}"
694 529
695 # handle groups 530 # handle groups
696 local egroups="$1"; shift 531 local egroups=$1; shift
697 if [ ! -z "${egroups}" ] 532 if [[ ! -z ${egroups} ]] ; then
698 then
699 local oldifs="${IFS}" 533 local oldifs=${IFS}
700 local defgroup="" exgroups="" 534 local defgroup="" exgroups=""
701 535
702 export IFS="," 536 export IFS=","
703 for g in ${egroups} 537 for g in ${egroups} ; do
704 do
705 export IFS="${oldifs}" 538 export IFS=${oldifs}
706 if [ -z "`egetent group \"${g}\"`" ] 539 if [[ -z $(egetent group "${g}") ]] ; then
707 then
708 eerror "You must add group ${g} to the system first" 540 eerror "You must add group ${g} to the system first"
709 die "${g} is not a valid GID" 541 die "${g} is not a valid GID"
710 fi 542 fi
711 if [ -z "${defgroup}" ] 543 if [[ -z ${defgroup} ]] ; then
712 then
713 defgroup="${g}" 544 defgroup=${g}
714 else 545 else
715 exgroups="${exgroups},${g}" 546 exgroups="${exgroups},${g}"
716 fi 547 fi
717 export IFS="," 548 export IFS=","
718 done 549 done
719 export IFS="${oldifs}" 550 export IFS=${oldifs}
720 551
721 opts="${opts} -g ${defgroup}" 552 opts="${opts} -g ${defgroup}"
722 if [ ! -z "${exgroups}" ] 553 if [[ ! -z ${exgroups} ]] ; then
723 then
724 opts="${opts} -G ${exgroups:1}" 554 opts="${opts} -G ${exgroups:1}"
725 fi 555 fi
726 else 556 else
727 egroups="(none)" 557 egroups="(none)"
728 fi 558 fi
729 einfo " - Groups: ${egroups}" 559 einfo " - Groups: ${egroups}"
730 560
731 # handle extra and add the user 561 # handle extra and add the user
732 local eextra="$@"
733 local oldsandbox="${SANDBOX_ON}" 562 local oldsandbox=${SANDBOX_ON}
734 export SANDBOX_ON="0" 563 export SANDBOX_ON="0"
735 if useq ppc-macos 564 case ${CHOST} in
736 then 565 *-darwin*)
737 ### Make the user 566 ### Make the user
738 if [ -z "${eextra}" ] 567 if [[ -z $@ ]] ; then
739 then
740 dscl . create /users/${euser} uid ${euid} 568 dscl . create /users/${euser} uid ${euid}
741 dscl . create /users/${euser} shell ${eshell} 569 dscl . create /users/${euser} shell ${eshell}
742 dscl . create /users/${euser} home ${ehome} 570 dscl . create /users/${euser} home ${ehome}
743 dscl . create /users/${euser} realname "added by portage for ${PN}" 571 dscl . create /users/${euser} realname "added by portage for ${PN}"
744 ### Add the user to the groups specified 572 ### Add the user to the groups specified
745 local oldifs="${IFS}" 573 local oldifs=${IFS}
746 export IFS="," 574 export IFS=","
747 for g in ${egroups} 575 for g in ${egroups} ; do
748 do
749 dscl . merge /groups/${g} users ${euser} 576 dscl . merge /groups/${g} users ${euser}
750 done 577 done
751 export IFS="${oldifs}" 578 export IFS=${oldifs}
752 else 579 else
753 einfo "Extra options are not supported on macos yet" 580 einfo "Extra options are not supported on Darwin yet"
754 einfo "Please report the ebuild along with the info below" 581 einfo "Please report the ebuild along with the info below"
755 einfo "eextra: ${eextra}" 582 einfo "eextra: $@"
756 die "Required function missing" 583 die "Required function missing"
757 fi 584 fi
758 elif use x86-fbsd ; then 585 ;;
759 if [ -z "${eextra}" ] 586 *-freebsd*|*-dragonfly*)
760 then 587 if [[ -z $@ ]] ; then
761 pw useradd ${euser} ${opts} \ 588 pw useradd ${euser} ${opts} \
762 -c "added by portage for ${PN}" \ 589 -c "added by portage for ${PN}" \
763 die "enewuser failed" 590 die "enewuser failed"
764 else 591 else
765 einfo " - Extra: ${eextra}" 592 einfo " - Extra: $@"
766 pw useradd ${euser} ${opts} \ 593 pw useradd ${euser} ${opts} \
767 -c ${eextra} || die "enewuser failed" 594 "$@" || die "enewuser failed"
768 fi 595 fi
596 ;;
597
598 *-netbsd*)
599 if [[ -z $@ ]] ; then
600 useradd ${opts} ${euser} || die "enewuser failed"
769 else 601 else
770 if [ -z "${eextra}" ] 602 einfo " - Extra: $@"
771 then 603 useradd ${opts} ${euser} "$@" || die "enewuser failed"
604 fi
605 ;;
606
607 *-openbsd*)
608 if [[ -z $@ ]] ; then
609 useradd -u ${euid} -s ${eshell} \
610 -d ${ehome} -c "Added by portage for ${PN}" \
611 -g ${egroups} ${euser} || die "enewuser failed"
612 else
613 einfo " - Extra: $@"
614 useradd -u ${euid} -s ${eshell} \
615 -d ${ehome} -c "Added by portage for ${PN}" \
616 -g ${egroups} ${euser} "$@" || die "enewuser failed"
617 fi
618 ;;
619
620 *)
621 if [[ -z $@ ]] ; then
772 useradd ${opts} ${euser} \ 622 useradd ${opts} ${euser} \
773 -c "added by portage for ${PN}" \ 623 -c "added by portage for ${PN}" \
774 || die "enewuser failed" 624 || die "enewuser failed"
775 else 625 else
776 einfo " - Extra: ${eextra}" 626 einfo " - Extra: $@"
777 useradd ${opts} ${euser} ${eextra} \ 627 useradd ${opts} ${euser} "$@" \
778 || die "enewuser failed" 628 || die "enewuser failed"
779 fi 629 fi
630 ;;
631 esac
632
633 if [[ ! -e ${ROOT}/${ehome} ]] ; then
634 einfo " - Creating ${ehome} in ${ROOT}"
635 mkdir -p "${ROOT}/${ehome}"
636 chown ${euser} "${ROOT}/${ehome}"
637 chmod 755 "${ROOT}/${ehome}"
780 fi 638 fi
639
781 export SANDBOX_ON="${oldsandbox}" 640 export SANDBOX_ON=${oldsandbox}
782
783 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ]
784 then
785 einfo " - Creating ${ehome} in ${D}"
786 dodir ${ehome}
787 fowners ${euser} ${ehome}
788 fperms 755 ${ehome}
789 fi
790} 641}
791 642
792# Simplify/standardize adding groups to the system 643# Simplify/standardize adding groups to the system
793# vapier@gentoo.org 644# vapier@gentoo.org
794# 645#
823 then 674 then
824 if [ "${egid}" -gt 0 ] 675 if [ "${egid}" -gt 0 ]
825 then 676 then
826 if [ -z "`egetent group ${egid}`" ] 677 if [ -z "`egetent group ${egid}`" ]
827 then 678 then
828 if useq ppc-macos ; then 679 if [[ "${CHOST}" == *-darwin* ]]; then
829 opts="${opts} ${egid}" 680 opts="${opts} ${egid}"
830 else 681 else
831 opts="${opts} -g ${egid}" 682 opts="${opts} -g ${egid}"
832 fi 683 fi
833 else 684 else
847 opts="${opts} ${eextra}" 698 opts="${opts} ${eextra}"
848 699
849 # add the group 700 # add the group
850 local oldsandbox="${SANDBOX_ON}" 701 local oldsandbox="${SANDBOX_ON}"
851 export SANDBOX_ON="0" 702 export SANDBOX_ON="0"
852 if useq ppc-macos ; then 703 case ${CHOST} in
704 *-darwin*)
853 if [ ! -z "${eextra}" ]; 705 if [ ! -z "${eextra}" ];
854 then 706 then
855 einfo "Extra options are not supported on macos yet" 707 einfo "Extra options are not supported on Darwin/OS X yet"
856 einfo "Please report the ebuild along with the info below" 708 einfo "Please report the ebuild along with the info below"
857 einfo "eextra: ${eextra}" 709 einfo "eextra: ${eextra}"
858 die "Required function missing" 710 die "Required function missing"
859 fi 711 fi
860 712
861 # If we need the next available 713 # If we need the next available
862 case ${egid} in 714 case ${egid} in
863 *[!0-9]*) # Non numeric 715 *[!0-9]*) # Non numeric
864 for egid in `jot 898 101`; do 716 for egid in $(seq 101 999); do
865 [ -z "`egetent group ${egid}`" ] && break 717 [ -z "`egetent group ${egid}`" ] && break
866 done 718 done
867 esac 719 esac
868 dscl . create /groups/${egroup} gid ${egid} 720 dscl . create /groups/${egroup} gid ${egid}
869 dscl . create /groups/${egroup} passwd '*' 721 dscl . create /groups/${egroup} passwd '*'
870 elif use x86-fbsd ; then 722 ;;
723
724 *-freebsd*|*-dragonfly*)
871 case ${egid} in 725 case ${egid} in
872 *[!0-9]*) # Non numeric 726 *[!0-9]*) # Non numeric
873 for egid in `jot 898 101`; do 727 for egid in $(seq 101 999); do
874 [ -z "`egetent group ${egid}`" ] && break 728 [ -z "`egetent group ${egid}`" ] && break
875 done 729 done
876 esac 730 esac
877 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 731 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
878 else 732 ;;
733
734 *-netbsd*)
735 case ${egid} in
736 *[!0-9]*) # Non numeric
737 for egid in $(seq 101 999); do
738 [ -z "`egetent group ${egid}`" ] && break
739 done
740 esac
741 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
742 ;;
743
744 *)
879 groupadd ${opts} ${egroup} || die "enewgroup failed" 745 groupadd ${opts} ${egroup} || die "enewgroup failed"
880 fi 746 ;;
747 esac
881 export SANDBOX_ON="${oldsandbox}" 748 export SANDBOX_ON="${oldsandbox}"
882} 749}
883 750
884# Simple script to replace 'dos2unix' binaries 751# Simple script to replace 'dos2unix' binaries
885# vapier@gentoo.org 752# vapier@gentoo.org
910# name: the name that will show up in the menu 777# name: the name that will show up in the menu
911# icon: give your little like a pretty little icon ... 778# icon: give your little like a pretty little icon ...
912# this can be relative (to /usr/share/pixmaps) or 779# this can be relative (to /usr/share/pixmaps) or
913# a full path to an icon 780# a full path to an icon
914# type: what kind of application is this ? for categories: 781# type: what kind of application is this ? for categories:
915# http://www.freedesktop.org/standards/menu-spec/ 782# http://www.freedesktop.org/Standards/desktop-entry-spec
916# path: if your app needs to startup in a specific dir 783# path: if your app needs to startup in a specific dir
917make_desktop_entry() { 784make_desktop_entry() {
918 [ -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
919 786
920 local exec="${1}" 787 local exec=${1}
921 local name="${2:-${PN}}" 788 local name=${2:-${PN}}
922 local icon="${3:-${PN}.png}" 789 local icon=${3:-${PN}.png}
923 local type="${4}" 790 local type=${4}
924 local subdir="${6}" 791 local path=${5}
925 local path="${5:-${GAMES_BINDIR}}" 792
926 if [ -z "${type}" ] 793 if [[ -z ${type} ]] ; then
927 then 794 local catmaj=${CATEGORY%%-*}
928 case ${CATEGORY} in 795 local catmin=${CATEGORY##*-}
929 "app-emulation") 796 case ${catmaj} in
930 type=Emulator 797 app)
931 subdir="Emulation" 798 case ${catmin} in
799 admin) type=System;;
800 cdr) type=DiscBurning;;
801 dicts) type=Dictionary;;
802 editors) type=TextEditor;;
803 emacs) type=TextEditor;;
804 emulation) type=Emulator;;
805 laptop) type=HardwareSettings;;
806 office) type=Office;;
807 vim) type=TextEditor;;
808 xemacs) type=TextEditor;;
809 *) type=;;
810 esac
932 ;; 811 ;;
933 "games-"*) 812
934 type=Game 813 dev)
935 subdir="Games" 814 type="Development"
936 ;; 815 ;;
937 "net-"*) 816
938 type=Network 817 games)
939 subdir="${type}" 818 case ${catmin} in
819 action) type=ActionGame;;
820 arcade) type=ArcadeGame;;
821 board) type=BoardGame;;
822 kid) type=KidsGame;;
823 emulation) type=Emulator;;
824 puzzle) type=LogicGame;;
825 rpg) type=RolePlaying;;
826 roguelike) type=RolePlaying;;
827 simulation) type=Simulation;;
828 sports) type=SportsGame;;
829 strategy) type=StrategyGame;;
830 *) type=;;
831 esac
832 type="Game;${type}"
940 ;; 833 ;;
834
835 mail)
836 type="Network;Email"
837 ;;
838
839 media)
840 case ${catmin} in
841 gfx) type=Graphics;;
842 radio) type=Tuner;;
843 sound) type=Audio;;
844 tv) type=TV;;
845 video) type=Video;;
846 *) type=;;
847 esac
848 type="AudioVideo;${type}"
849 ;;
850
851 net)
852 case ${catmin} in
853 dialup) type=Dialup;;
854 ftp) type=FileTransfer;;
855 im) type=InstantMessaging;;
856 irc) type=IRCClient;;
857 mail) type=Email;;
858 news) type=News;;
859 nntp) type=News;;
860 p2p) type=FileTransfer;;
861 *) type=;;
862 esac
863 type="Network;${type}"
864 ;;
865
866 sci)
867 case ${catmin} in
868 astro*) type=Astronomy;;
869 bio*) type=Biology;;
870 calc*) type=Calculator;;
871 chem*) type=Chemistry;;
872 geo*) type=Geology;;
873 math*) type=Math;;
874 *) type=;;
875 esac
876 type="Science;${type}"
877 ;;
878
879 www)
880 case ${catmin} in
881 client) type=WebBrowser;;
882 *) type=;;
883 esac
884 type="Network"
885 ;;
886
941 *) 887 *)
942 type= 888 type=
943 subdir=
944 ;; 889 ;;
945 esac 890 esac
946 fi 891 fi
892 if [ "${SLOT}" == "0" ] ; then
893 local desktop_name="${PN}"
894 else
895 local desktop_name="${PN}-${SLOT}"
896 fi
947 local desktop="${T}/${exec}.desktop" 897 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
948 898
949echo "[Desktop Entry] 899echo "[Desktop Entry]
950Encoding=UTF-8 900Encoding=UTF-8
951Version=0.9.2 901Version=0.9.2
952Name=${name} 902Name=${name}
955Exec=${exec} 905Exec=${exec}
956Path=${path} 906Path=${path}
957Icon=${icon} 907Icon=${icon}
958Categories=Application;${type};" > "${desktop}" 908Categories=Application;${type};" > "${desktop}"
959 909
910 (
911 # wrap the env here so that the 'insinto' call
912 # doesn't corrupt the env of the caller
960 insinto /usr/share/applications 913 insinto /usr/share/applications
961 doins "${desktop}" 914 doins "${desktop}"
962 915 )
963 return 0
964} 916}
965 917
966# Make a GDM/KDM Session file 918# Make a GDM/KDM Session file
967# 919#
968# make_desktop_entry(<title>, <command>) 920# make_desktop_entry(<title>, <command>)
969# title: File to execute to start the Window Manager 921# title: File to execute to start the Window Manager
970# command: Name of the Window Manager 922# command: Name of the Window Manager
971 923
972make_session_desktop() { 924make_session_desktop() {
973
974 [ -z "$1" ] && eerror "make_session_desktop: You must specify the title" && return 1 925 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1
975 [ -z "$2" ] && eerror "make_session_desktop: You must specify the command" && return 1 926 [[ -z $2 ]] && eerror "make_session_desktop: You must specify the command" && return 1
976 927
977 local title="${1}" 928 local title=$1
978 local command="${2}" 929 local command=$2
979 local desktop="${T}/${wm}.desktop" 930 local desktop=${T}/${wm}.desktop
980 931
981echo "[Desktop Entry] 932echo "[Desktop Entry]
982Encoding=UTF-8 933Encoding=UTF-8
983Name=${title} 934Name=${title}
984Comment=This session logs you into ${title} 935Comment=This session logs you into ${title}
986TryExec=${command} 937TryExec=${command}
987Type=Application" > "${desktop}" 938Type=Application" > "${desktop}"
988 939
989 insinto /usr/share/xsessions 940 insinto /usr/share/xsessions
990 doins "${desktop}" 941 doins "${desktop}"
991
992 return 0
993} 942}
994 943
995domenu() { 944domenu() {
996 local i 945 local i j
997 local j
998 insinto /usr/share/applications 946 insinto /usr/share/applications
999 for i in ${@} 947 for i in "$@" ; do
1000 do
1001 if [ -f "${i}" ]; 948 if [[ -f ${i} ]] ; then
1002 then
1003 doins ${i} 949 doins "${i}"
1004 elif [ -d "${i}" ]; 950 elif [[ -d ${i} ]] ; then
1005 then
1006 for j in ${i}/*.desktop 951 for j in "${i}"/*.desktop ; do
1007 do
1008 doins ${j} 952 doins "${j}"
1009 done 953 done
1010 fi 954 fi
1011 done 955 done
1012} 956}
957newmenu() {
958 insinto /usr/share/applications
959 newins "$1" "$2"
960}
1013 961
1014doicon() { 962doicon() {
1015 local i 963 local i j
1016 local j
1017 insinto /usr/share/pixmaps 964 insinto /usr/share/pixmaps
1018 for i in ${@} 965 for i in "$@" ; do
1019 do
1020 if [ -f "${i}" ]; 966 if [[ -f ${i} ]] ; then
1021 then
1022 doins ${i} 967 doins "${i}"
1023 elif [ -d "${i}" ]; 968 elif [[ -d ${i} ]] ; then
1024 then
1025 for j in ${i}/*.png 969 for j in "${i}"/*.png ; do
1026 do
1027 doins ${j} 970 doins "${j}"
1028 done 971 done
1029 fi 972 fi
1030 done 973 done
974}
975newicon() {
976 insinto /usr/share/pixmaps
977 newins "$1" "$2"
1031} 978}
1032 979
1033############################################################## 980##############################################################
1034# END: Handle .desktop files and menu entries # 981# END: Handle .desktop files and menu entries #
1035############################################################## 982##############################################################
1036 983
1037 984
1038# for internal use only (unpack_pdv and unpack_makeself) 985# for internal use only (unpack_pdv and unpack_makeself)
1039find_unpackable_file() { 986find_unpackable_file() {
1040 local src="$1" 987 local src=$1
1041 if [ -z "${src}" ] 988 if [[ -z ${src} ]] ; then
1042 then
1043 src="${DISTDIR}/${A}" 989 src=${DISTDIR}/${A}
1044 else 990 else
1045 if [ -e "${DISTDIR}/${src}" ] 991 if [[ -e ${DISTDIR}/${src} ]] ; then
1046 then
1047 src="${DISTDIR}/${src}" 992 src=${DISTDIR}/${src}
1048 elif [ -e "${PWD}/${src}" ] 993 elif [[ -e ${PWD}/${src} ]] ; then
1049 then
1050 src="${PWD}/${src}" 994 src=${PWD}/${src}
1051 elif [ -e "${src}" ] 995 elif [[ -e ${src} ]] ; then
1052 then
1053 src="${src}" 996 src=${src}
1054 fi
1055 fi 997 fi
1056 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 998 fi
999 [[ ! -e ${src} ]] && return 1
1057 echo "${src}" 1000 echo "${src}"
1058} 1001}
1059 1002
1060# Unpack those pesky pdv generated files ... 1003# Unpack those pesky pdv generated files ...
1061# They're self-unpacking programs with the binary package stuffed in 1004# They're self-unpacking programs with the binary package stuffed in
1076# lseek 1019# lseek
1077# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1020# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
1078# lseek(3, -4, SEEK_END) = 2981250 1021# lseek(3, -4, SEEK_END) = 2981250
1079# thus we would pass in the value of '4' as the second parameter. 1022# thus we would pass in the value of '4' as the second parameter.
1080unpack_pdv() { 1023unpack_pdv() {
1081 local src="`find_unpackable_file $1`" 1024 local src=$(find_unpackable_file $1)
1082 local sizeoff_t="$2" 1025 local sizeoff_t=$2
1083 1026
1027 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1084 [ -z "${sizeoff_t}" ] && die "No idea what off_t size was used for this pdv :(" 1028 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
1085 1029
1086 local shrtsrc="`basename ${src}`" 1030 local shrtsrc=$(basename "${src}")
1087 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1031 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1088 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1032 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
1089 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"` 1033 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
1090 1034
1091 # grab metadata for debug reasons 1035 # grab metadata for debug reasons
1155# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1099# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1156# - If the file is not specified then unpack will utilize ${A}. 1100# - If the file is not specified then unpack will utilize ${A}.
1157# - If the offset is not specified then we will attempt to extract 1101# - If the offset is not specified then we will attempt to extract
1158# the proper offset from the script itself. 1102# the proper offset from the script itself.
1159unpack_makeself() { 1103unpack_makeself() {
1104 local src_input=${1:-${A}}
1160 local src="$(find_unpackable_file "$1")" 1105 local src=$(find_unpackable_file "${src_input}")
1161 local skip="$2" 1106 local skip=$2
1162 local exe="$3" 1107 local exe=$3
1163 1108
1109 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1110
1164 local shrtsrc="$(basename "${src}")" 1111 local shrtsrc=$(basename "${src}")
1165 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1112 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1166 if [ -z "${skip}" ] 1113 if [[ -z ${skip} ]] ; then
1167 then
1168 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1114 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1169 local skip=0 1115 local skip=0
1170 exe=tail 1116 exe=tail
1171 case ${ver} in 1117 case ${ver} in
1172 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1118 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
1173 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1119 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1185 ;; 1131 ;;
1186 2.1.3) 1132 2.1.3)
1187 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1133 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1188 let skip="skip + 1" 1134 let skip="skip + 1"
1189 ;; 1135 ;;
1190 2.1.4) 1136 2.1.4|2.1.5)
1191 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1) 1137 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
1192 skip=$(head -n ${skip} "${src}" | wc -c) 1138 skip=$(head -n ${skip} "${src}" | wc -c)
1193 exe="dd" 1139 exe="dd"
1194 ;; 1140 ;;
1195 *) 1141 *)
1240check_license() { 1186check_license() {
1241 local lic=$1 1187 local lic=$1
1242 if [ -z "${lic}" ] ; then 1188 if [ -z "${lic}" ] ; then
1243 lic="${PORTDIR}/licenses/${LICENSE}" 1189 lic="${PORTDIR}/licenses/${LICENSE}"
1244 else 1190 else
1245 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1191 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1246 lic="${PORTDIR}/licenses/${src}" 1192 lic="${PORTDIR}/licenses/${lic}"
1247 elif [ -e "${PWD}/${src}" ] ; then 1193 elif [ -e "${PWD}/${lic}" ] ; then
1248 lic="${PWD}/${src}" 1194 lic="${PWD}/${lic}"
1249 elif [ -e "${src}" ] ; then 1195 elif [ -e "${lic}" ] ; then
1250 lic="${src}" 1196 lic="${lic}"
1251 fi
1252 fi 1197 fi
1198 fi
1253 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1199 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1254 local l="`basename ${lic}`" 1200 local l="`basename ${lic}`"
1255 1201
1256 # here is where we check for the licenses the user already 1202 # here is where we check for the licenses the user already
1257 # accepted ... if we don't find a match, we make the user accept 1203 # accepted ... if we don't find a match, we make the user accept
1258 local shopts=$- 1204 local shopts=$-
1314 # first we figure out how many cds we're dealing with by 1260 # first we figure out how many cds we're dealing with by
1315 # the # of files they gave us 1261 # the # of files they gave us
1316 local cdcnt=0 1262 local cdcnt=0
1317 local f= 1263 local f=
1318 for f in "$@" ; do 1264 for f in "$@" ; do
1319 cdcnt=$((cdcnt + 1)) 1265 ((++cdcnt))
1320 export CDROM_CHECK_${cdcnt}="$f" 1266 export CDROM_CHECK_${cdcnt}="$f"
1321 done 1267 done
1322 export CDROM_TOTAL_CDS=${cdcnt} 1268 export CDROM_TOTAL_CDS=${cdcnt}
1323 export CDROM_CURRENT_CD=1 1269 export CDROM_CURRENT_CD=1
1324 1270
1325 # now we see if the user gave use CD_ROOT ... 1271 # now we see if the user gave use CD_ROOT ...
1326 # if they did, let's just believe them that it's correct 1272 # if they did, let's just believe them that it's correct
1327 if [[ ! -z ${CD_ROOT} ]] ; then
1328 export CDROM_ROOT=${CD_ROOT}
1329 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1330 return
1331 fi
1332 # do the same for CD_ROOT_X
1333 if [[ ! -z ${CD_ROOT_1} ]] ; then 1273 if [[ -n ${CD_ROOT}${CD_ROOT_1} ]] ; then
1334 local var= 1274 local var=
1335 cdcnt=0 1275 cdcnt=0
1336 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1276 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1337 cdcnt=$((cdcnt + 1)) 1277 ((++cdcnt))
1338 var="CD_ROOT_${cdcnt}" 1278 var="CD_ROOT_${cdcnt}"
1279 [[ -z ${!var} ]] && var="CD_ROOT"
1339 if [[ -z ${!var} ]] ; then 1280 if [[ -z ${!var} ]] ; then
1340 eerror "You must either use just the CD_ROOT" 1281 eerror "You must either use just the CD_ROOT"
1341 eerror "or specify ALL the CD_ROOT_X variables." 1282 eerror "or specify ALL the CD_ROOT_X variables."
1342 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables." 1283 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."
1343 die "could not locate CD_ROOT_${cdcnt}" 1284 die "could not locate CD_ROOT_${cdcnt}"
1344 fi 1285 fi
1345 export CDROM_ROOTS_${cdcnt}="${!var}"
1346 done 1286 done
1347 export CDROM_ROOT=${CDROM_ROOTS_1} 1287 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1348 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1288 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1289 export CDROM_SET=-1
1290 for f in ${CDROM_CHECK_1//:/ } ; do
1291 ((++CDROM_SET))
1292 [[ -e ${CD_ROOT}/${f} ]] && break
1293 done
1294 export CDROM_MATCH=${f}
1349 return 1295 return
1350 fi 1296 fi
1351 1297
1298 # User didn't help us out so lets make sure they know they can
1299 # simplify the whole process ...
1352 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1300 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1353 einfon "This ebuild will need the " 1301 einfo "This ebuild will need the ${CDROM_NAME:-cdrom for ${PN}}"
1354 if [[ -z ${CDROM_NAME} ]] ; then
1355 echo "cdrom for ${PN}."
1356 else
1357 echo "${CDROM_NAME}."
1358 fi
1359 echo 1302 echo
1360 einfo "If you do not have the CD, but have the data files" 1303 einfo "If you do not have the CD, but have the data files"
1361 einfo "mounted somewhere on your filesystem, just export" 1304 einfo "mounted somewhere on your filesystem, just export"
1362 einfo "the variable CD_ROOT so that it points to the" 1305 einfo "the variable CD_ROOT so that it points to the"
1363 einfo "directory containing the files." 1306 einfo "directory containing the files."
1367 echo 1310 echo
1368 else 1311 else
1369 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1312 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1370 cdcnt=0 1313 cdcnt=0
1371 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1314 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1372 cdcnt=$((cdcnt + 1)) 1315 ((++cdcnt))
1373 var="CDROM_NAME_${cdcnt}" 1316 var="CDROM_NAME_${cdcnt}"
1374 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}" 1317 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1375 done 1318 done
1376 echo 1319 echo
1377 einfo "If you do not have the CDs, but have the data files" 1320 einfo "If you do not have the CDs, but have the data files"
1378 einfo "mounted somewhere on your filesystem, just export" 1321 einfo "mounted somewhere on your filesystem, just export"
1379 einfo "the following variables so they point to the right place:" 1322 einfo "the following variables so they point to the right place:"
1380 einfon "" 1323 einfon ""
1381 cdcnt=0 1324 cdcnt=0
1382 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1325 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1383 cdcnt=$((cdcnt + 1)) 1326 ((++cdcnt))
1384 echo -n " CD_ROOT_${cdcnt}" 1327 echo -n " CD_ROOT_${cdcnt}"
1385 done 1328 done
1386 echo 1329 echo
1387 einfo "Or, if you have all the files in the same place, or" 1330 einfo "Or, if you have all the files in the same place, or"
1388 einfo "you only have one cdrom, you can export CD_ROOT" 1331 einfo "you only have one cdrom, you can export CD_ROOT"
1391 echo 1334 echo
1392 einfo "For example:" 1335 einfo "For example:"
1393 einfo "export CD_ROOT_1=/mnt/cdrom" 1336 einfo "export CD_ROOT_1=/mnt/cdrom"
1394 echo 1337 echo
1395 fi 1338 fi
1339
1340 export CDROM_SET=""
1396 export CDROM_CURRENT_CD=0 1341 export CDROM_CURRENT_CD=0
1397 cdrom_load_next_cd 1342 cdrom_load_next_cd
1398} 1343}
1399 1344
1400# this is only used when you need access to more than one cd. 1345# this is only used when you need access to more than one cd.
1401# when you have finished using the first cd, just call this function. 1346# when you have finished using the first cd, just call this function.
1402# when it returns, CDROM_ROOT will be pointing to the second cd. 1347# when it returns, CDROM_ROOT will be pointing to the second cd.
1403# remember, you can only go forward in the cd chain, you can't go back. 1348# remember, you can only go forward in the cd chain, you can't go back.
1404cdrom_load_next_cd() { 1349cdrom_load_next_cd() {
1405 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1406 local var= 1350 local var
1407 1351 ((++CDROM_CURRENT_CD))
1408 if [[ ! -z ${CD_ROOT} ]] ; then
1409 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1410 return
1411 fi
1412 1352
1413 unset CDROM_ROOT 1353 unset CDROM_ROOT
1414 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1354 var=CD_ROOT_${CDROM_CURRENT_CD}
1355 [[ -z ${!var} ]] && var="CD_ROOT"
1415 if [[ -z ${!var} ]] ; then 1356 if [[ -z ${!var} ]] ; then
1416 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1357 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1417 cdrom_locate_file_on_cd ${!var} 1358 _cdrom_locate_file_on_cd ${!var}
1418 else 1359 else
1419 export CDROM_ROOT=${!var} 1360 export CDROM_ROOT=${!var}
1420 fi 1361 fi
1421 1362
1422 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1363 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1427# all it does is try to locate a give file on a cd ... if the cd isn't 1368# all it does is try to locate a give file on a cd ... if the cd isn't
1428# found, then a message asking for the user to insert the cdrom will be 1369# found, then a message asking for the user to insert the cdrom will be
1429# displayed and we'll hang out here until: 1370# displayed and we'll hang out here until:
1430# (1) the file is found on a mounted cdrom 1371# (1) the file is found on a mounted cdrom
1431# (2) the user hits CTRL+C 1372# (2) the user hits CTRL+C
1432cdrom_locate_file_on_cd() { 1373_cdrom_locate_file_on_cd() {
1374 local mline=""
1375 local showedmsg=0
1376
1433 while [[ -z ${CDROM_ROOT} ]] ; do 1377 while [[ -z ${CDROM_ROOT} ]] ; do
1378 local i=0
1379 local -a cdset=(${*//:/ })
1380 if [[ -n ${CDROM_SET} ]] ; then
1381 cdset=(${cdset[${CDROM_SET}]})
1382 fi
1383
1384 while [[ -n ${cdset[${i}]} ]] ; do
1434 local dir="$(dirname ${@})" 1385 local dir=$(dirname ${cdset[${i}]})
1435 local file="$(basename ${@})" 1386 local file=$(basename ${cdset[${i}]})
1436 local mline=""
1437 local showedmsg=0
1438 1387
1439 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1388 for mline in $(mount | gawk '/(iso|cdrom|fs=cdfss)/ {print $3}') ; do
1440 [[ -d ${mline}/${dir} ]] || continue 1389 [[ -d ${mline}/${dir} ]] || continue
1441 [[ ! -z $(find ${mline}/${dir} -iname ${file} -maxdepth 1) ]] \ 1390 if [[ -n $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] ; then
1442 && export CDROM_ROOT=${mline} 1391 export CDROM_ROOT=${mline}
1392 export CDROM_SET=${i}
1393 export CDROM_MATCH=${cdset[${i}]}
1394 return
1395 fi
1396 done
1397
1398 ((++i))
1443 done 1399 done
1444 1400
1445 if [[ -z ${CDROM_ROOT} ]] ; then
1446 echo 1401 echo
1447 if [[ ${showedmsg} -eq 0 ]] ; then 1402 if [[ ${showedmsg} -eq 0 ]] ; then
1448 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1403 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1449 if [[ -z ${CDROM_NAME} ]] ; then 1404 if [[ -z ${CDROM_NAME} ]] ; then
1450 einfo "Please insert the cdrom for ${PN} now !" 1405 einfo "Please insert+mount the cdrom for ${PN} now !"
1451 else
1452 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1453 fi
1454 else 1406 else
1455 if [[ -z ${CDROM_NAME_1} ]] ; then
1456 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1457 else
1458 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1459 einfo "Please insert+mount the ${!var} cdrom now !" 1407 einfo "Please insert+mount the ${CDROM_NAME} cdrom now !"
1460 fi
1461 fi 1408 fi
1462 showedmsg=1 1409 else
1410 if [[ -z ${CDROM_NAME_1} ]] ; then
1411 einfo "Please insert+mount cd #${CDROM_CURRENT_CD} for ${PN} now !"
1412 else
1413 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1414 einfo "Please insert+mount the ${!var} cdrom now !"
1415 fi
1463 fi 1416 fi
1417 showedmsg=1
1418 fi
1464 einfo "Press return to scan for the cd again" 1419 einfo "Press return to scan for the cd again"
1465 einfo "or hit CTRL+C to abort the emerge." 1420 einfo "or hit CTRL+C to abort the emerge."
1466 read 1421 echo
1467 fi 1422 einfo "If you are having trouble with the detection"
1423 einfo "of your CD, it is possible that you do not have"
1424 einfo "Joliet support enabled in your kernel. Please"
1425 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1426 read || die "something is screwed with your system"
1468 done 1427 done
1469} 1428}
1470 1429
1471# Make sure that LINGUAS only contains languages that 1430# Make sure that LINGUAS only contains languages that
1472# a package can support 1431# a package can support
1480# directories and uses the intersection of the lists. 1439# directories and uses the intersection of the lists.
1481# The -u builds a list of po files found in all the 1440# The -u builds a list of po files found in all the
1482# directories and uses the union of the lists. 1441# directories and uses the union of the lists.
1483strip-linguas() { 1442strip-linguas() {
1484 local ls newls 1443 local ls newls
1485 if [ "$1" == "-i" ] || [ "$1" == "-u" ] ; then 1444 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1486 local op="$1"; shift 1445 local op=$1; shift
1487 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1446 ls=" $(find "$1" -name '*.po' -exec basename {} \;) "; shift
1488 local d f 1447 local d f
1489 for d in "$@" ; do 1448 for d in "$@" ; do
1490 if [ "${op}" == "-u" ] ; then 1449 if [[ ${op} == "-u" ]] ; then
1491 newls="${ls}" 1450 newls=${ls}
1492 else 1451 else
1493 newls="" 1452 newls=""
1494 fi 1453 fi
1495 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1454 for f in $(find "$d" -name '*.po' -exec basename {} \;) ; do
1496 if [ "${op}" == "-i" ] ; then 1455 if [[ ${op} == "-i" ]] ; then
1497 [ "${ls/ ${f} /}" != "${ls}" ] && newls="${newls} ${f}" 1456 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}"
1498 else 1457 else
1499 [ "${ls/ ${f} /}" == "${ls}" ] && newls="${newls} ${f}" 1458 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}"
1500 fi 1459 fi
1501 done 1460 done
1502 ls="${newls}" 1461 ls=${newls}
1503 done 1462 done
1504 ls="${ls//.po}" 1463 ls=${ls//.po}
1505 else 1464 else
1506 ls="$@" 1465 ls=$@
1507 fi 1466 fi
1508 1467
1509 ls=" ${ls} " 1468 ls=" ${ls} "
1510 newls="" 1469 newls=""
1511 for f in ${LINGUAS} ; do 1470 for f in ${LINGUAS} ; do
1512 if [ "${ls/ ${f} /}" != "${ls}" ] ; then 1471 if [[ ${ls/ ${f} /} != ${ls} ]] ; then
1513 newls="${newls} ${f}" 1472 newls="${newls} ${f}"
1514 else 1473 else
1515 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1474 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA"
1516 fi 1475 fi
1517 done 1476 done
1518 if [ -z "${newls}" ] ; then 1477 if [[ -z ${newls} ]] ; then
1519 unset LINGUAS 1478 export LINGUAS=""
1520 else 1479 else
1521 export LINGUAS="${newls}" 1480 export LINGUAS=${newls:1}
1522 fi 1481 fi
1523} 1482}
1524 1483
1525# moved from kernel.eclass since they are generally useful outside of 1484# moved from kernel.eclass since they are generally useful outside of
1526# kernel.eclass -iggy (20041002) 1485# kernel.eclass -iggy (20041002)
1534 while ((i--)) ; do 1493 while ((i--)) ; do
1535 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass" 1494 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1536 done 1495 done
1537 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1496 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1538 case ${ARCH} in 1497 case ${ARCH} in
1539 x86) export ARCH="i386";; 1498 x86) export ARCH="i386";;
1540 amd64) export ARCH="x86_64";; 1499 amd64) export ARCH="x86_64";;
1541 hppa) export ARCH="parisc";; 1500 hppa) export ARCH="parisc";;
1542 mips) export ARCH="mips";; 1501 mips) export ARCH="mips";;
1543 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! 1502 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!
1544 *) export ARCH="${ARCH}";; 1503 *) export ARCH="${ARCH}";;
1545 esac 1504 esac
1546} 1505}
1547 1506
1548# set's ARCH back to what portage expects 1507# set's ARCH back to what portage expects
1549set_arch_to_portage() { 1508set_arch_to_portage() {
1556 1515
1557# Jeremy Huddleston <eradicator@gentoo.org>: 1516# Jeremy Huddleston <eradicator@gentoo.org>:
1558# preserve_old_lib /path/to/libblah.so.0 1517# preserve_old_lib /path/to/libblah.so.0
1559# preserve_old_lib_notify /path/to/libblah.so.0 1518# preserve_old_lib_notify /path/to/libblah.so.0
1560# 1519#
1561# These functions are useful when a lib in your package changes --soname. Such 1520# These functions are useful when a lib in your package changes --library. Such
1562# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0 1521# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0
1563# would break packages that link against it. Most people get around this 1522# would break packages that link against it. Most people get around this
1564# by using the portage SLOT mechanism, but that is not always a relevant 1523# by using the portage SLOT mechanism, but that is not always a relevant
1565# solution, so instead you can add the following to your ebuilds: 1524# solution, so instead you can add the following to your ebuilds:
1566# 1525#
1593 LIB=$1 1552 LIB=$1
1594 1553
1595 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1554 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1596 SONAME=`basename ${LIB}` 1555 SONAME=`basename ${LIB}`
1597 1556
1598 einfo "An old version of an installed library was detected on your system." 1557 ewarn "An old version of an installed library was detected on your system."
1599 einfo "In order to avoid breaking packages that link against is, this older version" 1558 ewarn "In order to avoid breaking packages that link against it, this older version"
1600 einfo "is not being removed. In order to make full use of this newer version," 1559 ewarn "is not being removed. In order to make full use of this newer version,"
1601 einfo "you will need to execute the following command:" 1560 ewarn "you will need to execute the following command:"
1602 einfo " revdep-rebuild --soname ${SONAME}" 1561 ewarn " revdep-rebuild --library ${SONAME}"
1603 einfo 1562 ewarn
1604 einfo "After doing that, you can safely remove ${LIB}" 1563 ewarn "After doing that, you can safely remove ${LIB}"
1605 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1564 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1606 fi 1565 fi
1607} 1566}
1608 1567
1609# Hack for people to figure out if a package was built with 1568# Hack for people to figure out if a package was built with
1610# certain USE flags 1569# certain USE flags
1620 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1579 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1621 1580
1622 local PKG=$(best_version $1) 1581 local PKG=$(best_version $1)
1623 shift 1582 shift
1624 1583
1625 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE" 1584 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
1585
1586 # if the USE file doesnt exist, assume the $PKG is either
1587 # injected or package.provided
1626 [[ ! -e ${USEFILE} ]] && return 1 1588 [[ ! -e ${USEFILE} ]] && return 0
1627 1589
1628 local USE_BUILT=$(<${USEFILE}) 1590 local USE_BUILT=$(<${USEFILE})
1629 while [[ $# -gt 0 ]] ; do 1591 while [[ $# -gt 0 ]] ; do
1630 if [[ ${opt} = "-o" ]] ; then 1592 if [[ ${opt} = "-o" ]] ; then
1631 has $1 ${USE_BUILT} && return 0 1593 has $1 ${USE_BUILT} && return 0
1648 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null 1610 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
1649 done 1611 done
1650 eend 0 1612 eend 0
1651} 1613}
1652 1614
1653# dopamd [ file ] [ new file ] 1615# dopamd <file> [more files]
1654# 1616#
1655# Install pam auth config file in /etc/pam.d 1617# Install pam auth config file in /etc/pam.d
1656#
1657# The first argument, 'file' is required. Install as 'new file', if
1658# specified.
1659
1660dopamd() { 1618dopamd() {
1661 local pamd="$1" newpamd="${2:-$1}"
1662 [[ -z "$1" ]] && die "dopamd requires at least one argument." 1619 [[ -z $1 ]] && die "dopamd requires at least one argument"
1663 1620
1664 use pam || return 0 1621 use pam || return 0
1665 1622
1666 insinto /etc/pam.d 1623 INSDESTTREE=/etc/pam.d \
1667 # these are the default doins options, but be explicit just in case 1624 doins "$@" || die "failed to install $@"
1668 insopts -m 0644 -o root -g root
1669 newins ${pamd} ${newpamd} || die "failed to install ${newpamd}"
1670} 1625}
1626# newpamd <old name> <new name>
1627#
1628# Install pam file <old name> as <new name> in /etc/pam.d
1629newpamd() {
1630 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1631
1632 use pam || return 0
1633
1634 INSDESTTREE=/etc/pam.d \
1635 newins "$1" "$2" || die "failed to install $1 as $2"
1636}
1637
1638# make a wrapper script ...
1639# NOTE: this was originally games_make_wrapper, but I noticed other places where
1640# this could be used, so I have moved it here and made it not games-specific
1641# -- wolf31o2
1642# $1 == wrapper name
1643# $2 == binary to run
1644# $3 == directory to chdir before running binary
1645# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1646# $5 == path for wrapper
1647make_wrapper() {
1648 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1649 local tmpwrapper=$(emktemp)
1650 # We don't want to quote ${bin} so that people can pass complex
1651 # things as $bin ... "./someprog --args"
1652 cat << EOF > "${tmpwrapper}"
1653#!/bin/sh
1654cd "${chdir:-.}"
1655if [ -n "${libdir}" ] ; then
1656 if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
1657 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1658 else
1659 export LD_LIBRARY_PATH="${libdir}"
1660 fi
1661fi
1662exec ${bin} "\$@"
1663EOF
1664 chmod go+rx "${tmpwrapper}"
1665 if [[ -n ${path} ]] ; then
1666 exeinto "${path}"
1667 newexe "${tmpwrapper}" "${wrapper}"
1668 else
1669 newbin "${tmpwrapper}" "${wrapper}"
1670 fi
1671}

Legend:
Removed from v.1.148  
changed lines
  Added in v.1.228

  ViewVC Help
Powered by ViewVC 1.1.20