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

Diff of /eclass/eutils.eclass

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

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

Legend:
Removed from v.1.147  
changed lines
  Added in v.1.216

  ViewVC Help
Powered by ViewVC 1.1.20