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

Legend:
Removed from v.1.149  
changed lines
  Added in v.1.218

  ViewVC Help
Powered by ViewVC 1.1.20