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

Diff of /eclass/eutils.eclass

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

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

  ViewVC Help
Powered by ViewVC 1.1.20