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

Diff of /eclass/eutils.eclass

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

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

  ViewVC Help
Powered by ViewVC 1.1.20