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

Diff of /eclass/eutils.eclass

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

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

  ViewVC Help
Powered by ViewVC 1.1.20