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

Diff of /eclass/eutils.eclass

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

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

  ViewVC Help
Powered by ViewVC 1.1.20