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

Diff of /eclass/eutils.eclass

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

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

  ViewVC Help
Powered by ViewVC 1.1.20