/[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.200
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.200 2005/09/23 20:44:26 wolf31o2 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"
209 local PATCH_TARGET="${T}/$$.patch" 173 local PATCH_TARGET="${T}/$$.patch"
210 local PATCH_SUFFIX="" 174 local PATCH_SUFFIX=""
211 local SINGLE_PATCH="no" 175 local SINGLE_PATCH="no"
212 local x="" 176 local x=""
213 177
178 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
179
214 if [ "$#" -gt 1 ] 180 if [ "$#" -gt 1 ]
215 then 181 then
216 local m="" 182 local m=""
217 einfo "${#} patches to apply ..."
218 for m in "$@" ; do 183 for m in "$@" ; do
219 epatch "${m}" 184 epatch "${m}"
220 done 185 done
221 return 0 186 return 0
222 fi 187 fi
276 ;; 241 ;;
277 esac 242 esac
278 243
279 if [ "${SINGLE_PATCH}" = "no" ] 244 if [ "${SINGLE_PATCH}" = "no" ]
280 then 245 then
281 einfo "Applying various patches (bugfixes/updates) ..." 246 einfo "${EPATCH_MULTI_MSG}"
282 fi 247 fi
283 for x in ${EPATCH_SOURCE} 248 for x in ${EPATCH_SOURCE}
284 do 249 do
285 # New ARCH dependant patch naming scheme ... 250 # New ARCH dependant patch naming scheme ...
286 # 251 #
287 # ???_arch_foo.patch 252 # ???_arch_foo.patch
288 # 253 #
289 if [ -f ${x} ] && \ 254 if [ -f ${x} ] && \
290 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "`eval echo \$\{x/_${ARCH}_\}`" != "${x}" ] || \ 255 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "${x/_${ARCH}_}" != "${x}" ] || \
291 [ "${EPATCH_FORCE}" = "yes" ]) 256 [ "${EPATCH_FORCE}" = "yes" ])
292 then 257 then
293 local count=0 258 local count=0
294 local popts="${EPATCH_OPTS}" 259 local popts="${EPATCH_OPTS}"
260 local patchname=${x##*/}
295 261
296 if [ -n "${EPATCH_EXCLUDE}" ] 262 if [ -n "${EPATCH_EXCLUDE}" ]
297 then 263 then
298 if [ "`eval echo \$\{EPATCH_EXCLUDE/${x##*/}\}`" != "${EPATCH_EXCLUDE}" ] 264 if [ "${EPATCH_EXCLUDE/${patchname}}" != "${EPATCH_EXCLUDE}" ]
299 then 265 then
300 continue 266 continue
301 fi 267 fi
302 fi 268 fi
303 269
305 then 271 then
306 if [ -n "${EPATCH_SINGLE_MSG}" ] 272 if [ -n "${EPATCH_SINGLE_MSG}" ]
307 then 273 then
308 einfo "${EPATCH_SINGLE_MSG}" 274 einfo "${EPATCH_SINGLE_MSG}"
309 else 275 else
310 einfo "Applying ${x##*/} ..." 276 einfo "Applying ${patchname} ..."
311 fi 277 fi
312 else 278 else
313 einfo " ${x##*/} ..." 279 einfo " ${patchname} ..."
314 fi 280 fi
315 281
316 echo "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 282 echo "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
317 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 283 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
318 284
319 # Allow for prefix to differ ... im lazy, so shoot me :/ 285 # Allow for prefix to differ ... im lazy, so shoot me :/
320 while [ "${count}" -lt 5 ] 286 while [ "${count}" -lt 5 ]
321 do 287 do
322 # Generate some useful debug info ... 288 # Generate some useful debug info ...
323 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 289 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
324 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 290 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
325 291
326 if [ "${PATCH_SUFFIX}" != "patch" ] 292 if [ "${PATCH_SUFFIX}" != "patch" ]
327 then 293 then
328 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 294 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
329 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 295 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
330 else 296 else
331 PATCH_TARGET="${x}" 297 PATCH_TARGET="${x}"
332 fi 298 fi
333 299
334 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 300 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
335 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 301 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
336 302
337 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 303 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
338 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 304 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
339 305
340 if [ "${PATCH_SUFFIX}" != "patch" ] 306 if [ "${PATCH_SUFFIX}" != "patch" ]
341 then 307 then
342 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1 308 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
343 then 309 then
344 echo 310 echo
345 eerror "Could not extract patch!" 311 eerror "Could not extract patch!"
346 #die "Could not extract patch!" 312 #die "Could not extract patch!"
347 count=5 313 count=5
348 break 314 break
349 fi 315 fi
350 fi 316 fi
351 317
352 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1 318 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
353 then 319 then
354 draw_line "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 320 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
355 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 321 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
356 echo "ACTUALLY APPLYING ${x##*/} ..." >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 322 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
357 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 323 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
358 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 324 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
359 325
360 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 2>&1 326 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
361 327
362 if [ "$?" -ne 0 ] 328 if [ "$?" -ne 0 ]
363 then 329 then
364 cat ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 330 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
365 echo 331 echo
366 eerror "A dry-run of patch command succeeded, but actually" 332 eerror "A dry-run of patch command succeeded, but actually"
367 eerror "applying the patch failed!" 333 eerror "applying the patch failed!"
368 #die "Real world sux compared to the dreamworld!" 334 #die "Real world sux compared to the dreamworld!"
369 count=5 335 count=5
370 fi 336 fi
371 337
372 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 338 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
373 339
374 break 340 break
375 fi 341 fi
376 342
377 count=$((count + 1)) 343 count=$((count + 1))
383 fi 349 fi
384 350
385 if [ "${count}" -eq 5 ] 351 if [ "${count}" -eq 5 ]
386 then 352 then
387 echo 353 echo
388 eerror "Failed Patch: ${x##*/}!" 354 eerror "Failed Patch: ${patchname} !"
355 eerror " ( ${PATCH_TARGET} )"
389 eerror 356 eerror
390 eerror "Include in your bugreport the contents of:" 357 eerror "Include in your bugreport the contents of:"
391 eerror 358 eerror
392 eerror " ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}" 359 eerror " ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}"
393 echo 360 echo
394 die "Failed Patch: ${x##*/}!" 361 die "Failed Patch: ${patchname}!"
395 fi 362 fi
396 363
397 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 364 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
398 365
399 eend 0 366 eend 0
400 fi 367 fi
401 done 368 done
402 if [ "${SINGLE_PATCH}" = "no" ] 369 if [ "${SINGLE_PATCH}" = "no" ]
403 then 370 then
404 einfo "Done with patching" 371 einfo "Done with patching"
405 fi 372 fi
406} 373}
407 374
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) 375# Cheap replacement for when debianutils (and thus mktemp)
535# does not exist on the users system 376# does not exist on the users system
536# vapier@gentoo.org 377# vapier@gentoo.org
537# 378#
538# Takes just 1 optional parameter (the directory to create tmpfile in) 379# Takes just 1 optional parameter (the directory to create tmpfile in)
539emktemp() { 380emktemp() {
540 local exe="touch" 381 local exe="touch"
541 [ "$1" == "-d" ] && exe="mkdir" && shift 382 [[ $1 == -d ]] && exe="mkdir" && shift
542 local topdir="$1" 383 local topdir=$1
543 384
544 if [ -z "${topdir}" ] 385 if [[ -z ${topdir} ]] ; then
545 then
546 [ -z "${T}" ] \ 386 [[ -z ${T} ]] \
547 && topdir="/tmp" \ 387 && topdir="/tmp" \
548 || topdir="${T}" 388 || topdir=${T}
549 fi 389 fi
550 390
551 if [ -z "$(type -p mktemp)" ] 391 if [[ -z $(type -p mktemp) ]] ; then
552 then
553 local tmp=/ 392 local tmp=/
554 while [ -e "${tmp}" ] ; do 393 while [[ -e ${tmp} ]] ; do
555 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 394 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
556 done 395 done
557 ${exe} "${tmp}" 396 ${exe} "${tmp}" || ${exe} -p "${tmp}"
558 echo "${tmp}" 397 echo "${tmp}"
559 else 398 else
560 [ "${exe}" == "touch" ] \ 399 [[ ${exe} == "touch" ]] \
561 && exe="-p" \ 400 && exe="-p" \
562 || exe="-d" 401 || exe="-d"
563 mktemp ${exe} "${topdir}" 402 mktemp ${exe} "${topdir}"
564 fi 403 fi
565} 404}
569# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 408# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
570# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 409# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
571# 410#
572# egetent(database, key) 411# egetent(database, key)
573egetent() { 412egetent() {
574 if useq ppc-macos ; then 413 if [[ "${USERLAND}" == "Darwin" ]] ; then
575 case "$2" in 414 case "$2" in
576 *[!0-9]*) # Non numeric 415 *[!0-9]*) # Non numeric
577 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 416 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
578 ;; 417 ;;
579 *) # Numeric 418 *) # Numeric
580 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 419 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
581 ;; 420 ;;
582 esac 421 esac
583 elif useq x86-fbsd ; then 422 elif [[ "${USERLAND}" == "BSD" ]] ; then
584 local action 423 local action
585 if [ "$1" == "passwd" ] 424 if [ "$1" == "passwd" ]
586 then 425 then
587 action="user" 426 action="user"
588 else 427 else
608# homedir: /dev/null 447# homedir: /dev/null
609# groups: none 448# groups: none
610# extra: comment of 'added by portage for ${PN}' 449# extra: comment of 'added by portage for ${PN}'
611enewuser() { 450enewuser() {
612 # get the username 451 # get the username
613 local euser="$1"; shift 452 local euser=$1; shift
614 if [ -z "${euser}" ] 453 if [[ -z ${euser} ]] ; then
615 then
616 eerror "No username specified !" 454 eerror "No username specified !"
617 die "Cannot call enewuser without a username" 455 die "Cannot call enewuser without a username"
618 fi 456 fi
619 457
620 # lets see if the username already exists 458 # lets see if the username already exists
621 if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ] 459 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then
622 then
623 return 0 460 return 0
624 fi 461 fi
625 einfo "Adding user '${euser}' to your system ..." 462 einfo "Adding user '${euser}' to your system ..."
626 463
627 # options to pass to useradd 464 # options to pass to useradd
628 local opts= 465 local opts=
629 466
630 # handle uid 467 # handle uid
631 local euid="$1"; shift 468 local euid=$1; shift
632 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] 469 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then
633 then
634 if [ "${euid}" -gt 0 ] 470 if [[ ${euid} -gt 0 ]] ; then
635 then
636 if [ ! -z "`egetent passwd ${euid}`" ] 471 if [[ ! -z $(egetent passwd ${euid}) ]] ; then
637 then
638 euid="next" 472 euid="next"
639 fi 473 fi
640 else 474 else
641 eerror "Userid given but is not greater than 0 !" 475 eerror "Userid given but is not greater than 0 !"
642 die "${euid} is not a valid UID" 476 die "${euid} is not a valid UID"
643 fi 477 fi
644 else 478 else
645 euid="next" 479 euid="next"
646 fi 480 fi
647 if [ "${euid}" == "next" ] 481 if [[ ${euid} == "next" ]] ; then
648 then 482 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 483 [[ -z $(egetent passwd ${euid}) ]] && break
657 done 484 done
658 fi 485 fi
659 opts="${opts} -u ${euid}" 486 opts="${opts} -u ${euid}"
660 einfo " - Userid: ${euid}" 487 einfo " - Userid: ${euid}"
661 488
662 # handle shell 489 # handle shell
663 local eshell="$1"; shift 490 local eshell=$1; shift
664 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ] 491 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
665 then
666 if [ ! -e "${eshell}" ] 492 if [[ ! -e ${eshell} ]] ; then
667 then
668 eerror "A shell was specified but it does not exist !" 493 eerror "A shell was specified but it does not exist !"
669 die "${eshell} does not exist" 494 die "${eshell} does not exist"
670 fi 495 fi
671 else 496 else
672 if [ "${USERLAND}" == "BSD" ] 497 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null; do
673 then 498 [[ -x ${ROOT}${shell} ]] && break;
674 eshell="/usr/bin/false" 499 done
675 else 500
676 eshell="/bin/false" 501 if [[ ${shell} == "/dev/null" ]]; then
502 eerror "Unable to identify the shell to use"
503 die "Unable to identify the shell to use"
677 fi 504 fi
505
506 eshell=${shell}
678 fi 507 fi
679 einfo " - Shell: ${eshell}" 508 einfo " - Shell: ${eshell}"
680 opts="${opts} -s ${eshell}" 509 opts="${opts} -s ${eshell}"
681 510
682 # handle homedir 511 # handle homedir
683 local ehome="$1"; shift 512 local ehome=$1; shift
684 if [ -z "${ehome}" ] && [ "${eshell}" != "-1" ] 513 if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then
685 then
686 ehome="/dev/null" 514 ehome="/dev/null"
687 fi 515 fi
688 einfo " - Home: ${ehome}" 516 einfo " - Home: ${ehome}"
689 opts="${opts} -d ${ehome}" 517 opts="${opts} -d ${ehome}"
690 518
691 # handle groups 519 # handle groups
692 local egroups="$1"; shift 520 local egroups=$1; shift
693 if [ ! -z "${egroups}" ] 521 if [[ ! -z ${egroups} ]] ; then
694 then
695 local oldifs="${IFS}" 522 local oldifs=${IFS}
696 local defgroup="" exgroups="" 523 local defgroup="" exgroups=""
697 524
698 export IFS="," 525 export IFS=","
699 for g in ${egroups} 526 for g in ${egroups} ; do
700 do
701 export IFS="${oldifs}" 527 export IFS=${oldifs}
702 if [ -z "`egetent group \"${g}\"`" ] 528 if [[ -z $(egetent group "${g}") ]] ; then
703 then
704 eerror "You must add group ${g} to the system first" 529 eerror "You must add group ${g} to the system first"
705 die "${g} is not a valid GID" 530 die "${g} is not a valid GID"
706 fi 531 fi
707 if [ -z "${defgroup}" ] 532 if [[ -z ${defgroup} ]] ; then
708 then
709 defgroup="${g}" 533 defgroup=${g}
710 else 534 else
711 exgroups="${exgroups},${g}" 535 exgroups="${exgroups},${g}"
712 fi 536 fi
713 export IFS="," 537 export IFS=","
714 done 538 done
715 export IFS="${oldifs}" 539 export IFS=${oldifs}
716 540
717 opts="${opts} -g ${defgroup}" 541 opts="${opts} -g ${defgroup}"
718 if [ ! -z "${exgroups}" ] 542 if [[ ! -z ${exgroups} ]] ; then
719 then
720 opts="${opts} -G ${exgroups:1}" 543 opts="${opts} -G ${exgroups:1}"
721 fi 544 fi
722 else 545 else
723 egroups="(none)" 546 egroups="(none)"
724 fi 547 fi
725 einfo " - Groups: ${egroups}" 548 einfo " - Groups: ${egroups}"
726 549
727 # handle extra and add the user 550 # handle extra and add the user
728 local eextra="$@"
729 local oldsandbox="${SANDBOX_ON}" 551 local oldsandbox=${SANDBOX_ON}
730 export SANDBOX_ON="0" 552 export SANDBOX_ON="0"
731 if useq ppc-macos 553 case ${USERLAND} in
732 then 554 Darwin)
733 ### Make the user 555 ### Make the user
734 if [ -z "${eextra}" ] 556 if [[ -z $@ ]] ; then
735 then
736 dscl . create /users/${euser} uid ${euid} 557 dscl . create /users/${euser} uid ${euid}
737 dscl . create /users/${euser} shell ${eshell} 558 dscl . create /users/${euser} shell ${eshell}
738 dscl . create /users/${euser} home ${ehome} 559 dscl . create /users/${euser} home ${ehome}
739 dscl . create /users/${euser} realname "added by portage for ${PN}" 560 dscl . create /users/${euser} realname "added by portage for ${PN}"
740 ### Add the user to the groups specified 561 ### Add the user to the groups specified
741 local oldifs="${IFS}" 562 local oldifs=${IFS}
742 export IFS="," 563 export IFS=","
743 for g in ${egroups} 564 for g in ${egroups} ; do
744 do
745 dscl . merge /groups/${g} users ${euser} 565 dscl . merge /groups/${g} users ${euser}
746 done 566 done
747 export IFS="${oldifs}" 567 export IFS=${oldifs}
748 else 568 else
749 einfo "Extra options are not supported on macos yet" 569 einfo "Extra options are not supported on Darwin yet"
750 einfo "Please report the ebuild along with the info below" 570 einfo "Please report the ebuild along with the info below"
751 einfo "eextra: ${eextra}" 571 einfo "eextra: $@"
752 die "Required function missing" 572 die "Required function missing"
753 fi 573 fi
754 elif use x86-fbsd ; then 574 ;;
755 if [ -z "${eextra}" ] 575 BSD)
756 then 576 if [[ -z $@ ]] ; then
757 pw useradd ${euser} ${opts} \ 577 pw useradd ${euser} ${opts} \
758 -c "added by portage for ${PN}" \ 578 -c "added by portage for ${PN}" \
759 die "enewuser failed" 579 die "enewuser failed"
760 else 580 else
761 einfo " - Extra: ${eextra}" 581 einfo " - Extra: $@"
762 pw useradd ${euser} ${opts} \ 582 pw useradd ${euser} ${opts} \
763 -c ${eextra} || die "enewuser failed" 583 "$@" || die "enewuser failed"
764 fi 584 fi
765 else 585 ;;
766 if [ -z "${eextra}" ] 586 *)
767 then 587 if [[ -z $@ ]] ; then
768 useradd ${opts} ${euser} \ 588 useradd ${opts} ${euser} \
769 -c "added by portage for ${PN}" \ 589 -c "added by portage for ${PN}" \
770 || die "enewuser failed" 590 || die "enewuser failed"
771 else 591 else
772 einfo " - Extra: ${eextra}" 592 einfo " - Extra: $@"
773 useradd ${opts} ${euser} ${eextra} \ 593 useradd ${opts} ${euser} "$@" \
774 || die "enewuser failed" 594 || die "enewuser failed"
775 fi 595 fi
596 ;;
597 esac
598
599 if [[ ! -e ${ROOT}/${ehome} ]] ; then
600 einfo " - Creating ${ehome} in ${ROOT}"
601 mkdir -p "${ROOT}/${ehome}"
602 chown ${euser} "${ROOT}/${ehome}"
603 chmod 755 "${ROOT}/${ehome}"
776 fi 604 fi
605
777 export SANDBOX_ON="${oldsandbox}" 606 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} 607}
787 608
788# Simplify/standardize adding groups to the system 609# Simplify/standardize adding groups to the system
789# vapier@gentoo.org 610# vapier@gentoo.org
790# 611#
819 then 640 then
820 if [ "${egid}" -gt 0 ] 641 if [ "${egid}" -gt 0 ]
821 then 642 then
822 if [ -z "`egetent group ${egid}`" ] 643 if [ -z "`egetent group ${egid}`" ]
823 then 644 then
824 if useq ppc-macos ; then 645 if [[ "${USERLAND}" == "Darwin" ]]; then
825 opts="${opts} ${egid}" 646 opts="${opts} ${egid}"
826 else 647 else
827 opts="${opts} -g ${egid}" 648 opts="${opts} -g ${egid}"
828 fi 649 fi
829 else 650 else
843 opts="${opts} ${eextra}" 664 opts="${opts} ${eextra}"
844 665
845 # add the group 666 # add the group
846 local oldsandbox="${SANDBOX_ON}" 667 local oldsandbox="${SANDBOX_ON}"
847 export SANDBOX_ON="0" 668 export SANDBOX_ON="0"
848 if useq ppc-macos ; then 669 if [[ "${USERLAND}" == "Darwin" ]]; then
849 if [ ! -z "${eextra}" ]; 670 if [ ! -z "${eextra}" ];
850 then 671 then
851 einfo "Extra options are not supported on macos yet" 672 einfo "Extra options are not supported on Darwin/OS X yet"
852 einfo "Please report the ebuild along with the info below" 673 einfo "Please report the ebuild along with the info below"
853 einfo "eextra: ${eextra}" 674 einfo "eextra: ${eextra}"
854 die "Required function missing" 675 die "Required function missing"
855 fi 676 fi
856 677
857 # If we need the next available 678 # If we need the next available
858 case ${egid} in 679 case ${egid} in
859 *[!0-9]*) # Non numeric 680 *[!0-9]*) # Non numeric
860 for egid in `jot 898 101`; do 681 for egid in $(seq 101 999); do
861 [ -z "`egetent group ${egid}`" ] && break 682 [ -z "`egetent group ${egid}`" ] && break
862 done 683 done
863 esac 684 esac
864 dscl . create /groups/${egroup} gid ${egid} 685 dscl . create /groups/${egroup} gid ${egid}
865 dscl . create /groups/${egroup} passwd '*' 686 dscl . create /groups/${egroup} passwd '*'
866 elif use x86-fbsd ; then 687 elif [[ "${USERLAND}" == "BSD" ]] ; then
867 case ${egid} in 688 case ${egid} in
868 *[!0-9]*) # Non numeric 689 *[!0-9]*) # Non numeric
869 for egid in `jot 898 101`; do 690 for egid in $(seq 101 999); do
870 [ -z "`egetent group ${egid}`" ] && break 691 [ -z "`egetent group ${egid}`" ] && break
871 done 692 done
872 esac 693 esac
873 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 694 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
874 else 695 else
906# name: the name that will show up in the menu 727# name: the name that will show up in the menu
907# icon: give your little like a pretty little icon ... 728# icon: give your little like a pretty little icon ...
908# this can be relative (to /usr/share/pixmaps) or 729# this can be relative (to /usr/share/pixmaps) or
909# a full path to an icon 730# a full path to an icon
910# type: what kind of application is this ? for categories: 731# type: what kind of application is this ? for categories:
911# http://www.freedesktop.org/standards/menu-spec/ 732# http://www.freedesktop.org/Standards/desktop-entry-spec
912# path: if your app needs to startup in a specific dir 733# path: if your app needs to startup in a specific dir
913make_desktop_entry() { 734make_desktop_entry() {
914 [ -z "$1" ] && eerror "make_desktop_entry: You must specify the executable" && return 1 735 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
915 736
916 local exec="${1}" 737 local exec=${1}
917 local name="${2:-${PN}}" 738 local name=${2:-${PN}}
918 local icon="${3:-${PN}.png}" 739 local icon=${3:-${PN}.png}
919 local type="${4}" 740 local type=${4}
920 local subdir="${6}" 741 local path=${5}
921 local path="${5:-${GAMES_BINDIR}}" 742
922 if [ -z "${type}" ] 743 if [[ -z ${type} ]] ; then
923 then 744 local catmaj=${CATEGORY%%-*}
924 case ${CATEGORY} in 745 local catmin=${CATEGORY##*-}
925 "app-emulation") 746 case ${catmaj} in
926 type=Emulator 747 app)
927 subdir="Emulation" 748 case ${catmin} in
749 admin) type=System;;
750 cdr) type=DiscBurning;;
751 dicts) type=Dictionary;;
752 editors) type=TextEditor;;
753 emacs) type=TextEditor;;
754 emulation) type=Emulator;;
755 laptop) type=HardwareSettings;;
756 office) type=Office;;
757 vim) type=TextEditor;;
758 xemacs) type=TextEditor;;
759 *) type=;;
760 esac
928 ;; 761 ;;
929 "games-"*) 762
930 type=Game 763 dev)
931 subdir="Games" 764 type="Development"
932 ;; 765 ;;
933 "net-"*) 766
934 type=Network 767 games)
935 subdir="${type}" 768 case ${catmin} in
769 action) type=ActionGame;;
770 arcade) type=ArcadeGame;;
771 board) type=BoardGame;;
772 kid) type=KidsGame;;
773 emulation) type=Emulator;;
774 puzzle) type=LogicGame;;
775 rpg) type=RolePlaying;;
776 roguelike) type=RolePlaying;;
777 simulation) type=Simulation;;
778 sports) type=SportsGame;;
779 strategy) type=StrategyGame;;
780 *) type=;;
781 esac
782 type="Game;${type}"
936 ;; 783 ;;
784
785 mail)
786 type="Network;Email"
787 ;;
788
789 media)
790 case ${catmin} in
791 gfx) type=Graphics;;
792 radio) type=Tuner;;
793 sound) type=Audio;;
794 tv) type=TV;;
795 video) type=Video;;
796 *) type=;;
797 esac
798 type="AudioVideo;${type}"
799 ;;
800
801 net)
802 case ${catmin} in
803 dialup) type=Dialup;;
804 ftp) type=FileTransfer;;
805 im) type=InstantMessaging;;
806 irc) type=IRCClient;;
807 mail) type=Email;;
808 news) type=News;;
809 nntp) type=News;;
810 p2p) type=FileTransfer;;
811 *) type=;;
812 esac
813 type="Network;${type}"
814 ;;
815
816 sci)
817 case ${catmin} in
818 astro*) type=Astronomoy;;
819 bio*) type=Biology;;
820 calc*) type=Calculator;;
821 chem*) type=Chemistry;;
822 geo*) type=Geology;;
823 math*) type=Math;;
824 *) type=;;
825 esac
826 type="Science;${type}"
827 ;;
828
829 www)
830 case ${catmin} in
831 client) type=WebBrowser;;
832 *) type=;;
833 esac
834 type="Network"
835 ;;
836
937 *) 837 *)
938 type= 838 type=
939 subdir=
940 ;; 839 ;;
941 esac 840 esac
942 fi 841 fi
842 if [ "${SLOT}" == "0" ] ; then
843 local desktop_name="${PN}"
844 else
845 local desktop_name="${PN}-${SLOT}"
846 fi
943 local desktop="${T}/${exec}.desktop" 847 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
944 848
945echo "[Desktop Entry] 849echo "[Desktop Entry]
946Encoding=UTF-8 850Encoding=UTF-8
947Version=0.9.2 851Version=0.9.2
948Name=${name} 852Name=${name}
964# make_desktop_entry(<title>, <command>) 868# make_desktop_entry(<title>, <command>)
965# title: File to execute to start the Window Manager 869# title: File to execute to start the Window Manager
966# command: Name of the Window Manager 870# command: Name of the Window Manager
967 871
968make_session_desktop() { 872make_session_desktop() {
969
970 [ -z "$1" ] && eerror "make_session_desktop: You must specify the title" && return 1 873 [[ -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 874 [[ -z $2 ]] && eerror "make_session_desktop: You must specify the command" && return 1
972 875
973 local title="${1}" 876 local title=$1
974 local command="${2}" 877 local command=$2
975 local desktop="${T}/${wm}.desktop" 878 local desktop=${T}/${wm}.desktop
976 879
977echo "[Desktop Entry] 880echo "[Desktop Entry]
978Encoding=UTF-8 881Encoding=UTF-8
979Name=${title} 882Name=${title}
980Comment=This session logs you into ${title} 883Comment=This session logs you into ${title}
982TryExec=${command} 885TryExec=${command}
983Type=Application" > "${desktop}" 886Type=Application" > "${desktop}"
984 887
985 insinto /usr/share/xsessions 888 insinto /usr/share/xsessions
986 doins "${desktop}" 889 doins "${desktop}"
987
988 return 0
989} 890}
990 891
991domenu() { 892domenu() {
992 local i 893 local i j
993 local j
994 insinto /usr/share/applications 894 insinto /usr/share/applications
995 for i in ${@} 895 for i in "$@" ; do
996 do
997 if [ -f "${i}" ]; 896 if [[ -f ${i} ]] ; then
998 then
999 doins ${i} 897 doins "${i}"
1000 elif [ -d "${i}" ]; 898 elif [[ -d ${i} ]] ; then
1001 then
1002 for j in ${i}/*.desktop 899 for j in "${i}"/*.desktop ; do
1003 do
1004 doins ${j} 900 doins "${j}"
1005 done 901 done
1006 fi 902 fi
1007 done 903 done
1008} 904}
905newmenu() {
906 insinto /usr/share/applications
907 newins "$1" "$2"
908}
1009 909
1010doicon() { 910doicon() {
1011 local i 911 local i j
1012 local j
1013 insinto /usr/share/pixmaps 912 insinto /usr/share/pixmaps
1014 for i in ${@} 913 for i in "$@" ; do
1015 do
1016 if [ -f "${i}" ]; 914 if [[ -f ${i} ]] ; then
1017 then
1018 doins ${i} 915 doins "${i}"
1019 elif [ -d "${i}" ]; 916 elif [[ -d ${i} ]] ; then
1020 then
1021 for j in ${i}/*.png 917 for j in "${i}"/*.png ; do
1022 do
1023 doins ${j} 918 doins "${j}"
1024 done 919 done
1025 fi 920 fi
1026 done 921 done
922}
923newicon() {
924 insinto /usr/share/pixmaps
925 newins "$1" "$2"
1027} 926}
1028 927
1029############################################################## 928##############################################################
1030# END: Handle .desktop files and menu entries # 929# END: Handle .desktop files and menu entries #
1031############################################################## 930##############################################################
1032 931
1033 932
1034# for internal use only (unpack_pdv and unpack_makeself) 933# for internal use only (unpack_pdv and unpack_makeself)
1035find_unpackable_file() { 934find_unpackable_file() {
1036 local src="$1" 935 local src=$1
1037 if [ -z "${src}" ] 936 if [[ -z ${src} ]] ; then
1038 then
1039 src="${DISTDIR}/${A}" 937 src=${DISTDIR}/${A}
1040 else 938 else
1041 if [ -e "${DISTDIR}/${src}" ] 939 if [[ -e ${DISTDIR}/${src} ]] ; then
1042 then
1043 src="${DISTDIR}/${src}" 940 src=${DISTDIR}/${src}
1044 elif [ -e "${PWD}/${src}" ] 941 elif [[ -e ${PWD}/${src} ]] ; then
1045 then
1046 src="${PWD}/${src}" 942 src=${PWD}/${src}
1047 elif [ -e "${src}" ] 943 elif [[ -e ${src} ]] ; then
1048 then
1049 src="${src}" 944 src=${src}
1050 fi
1051 fi 945 fi
1052 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 946 fi
947 [[ ! -e ${src} ]] && return 1
1053 echo "${src}" 948 echo "${src}"
1054} 949}
1055 950
1056# Unpack those pesky pdv generated files ... 951# Unpack those pesky pdv generated files ...
1057# They're self-unpacking programs with the binary package stuffed in 952# They're self-unpacking programs with the binary package stuffed in
1072# lseek 967# lseek
1073# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 968# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
1074# lseek(3, -4, SEEK_END) = 2981250 969# lseek(3, -4, SEEK_END) = 2981250
1075# thus we would pass in the value of '4' as the second parameter. 970# thus we would pass in the value of '4' as the second parameter.
1076unpack_pdv() { 971unpack_pdv() {
1077 local src="`find_unpackable_file $1`" 972 local src=$(find_unpackable_file $1)
1078 local sizeoff_t="$2" 973 local sizeoff_t=$2
1079 974
975 [[ -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 :(" 976 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
1081 977
1082 local shrtsrc="`basename ${src}`" 978 local shrtsrc="`basename ${src}`"
1083 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 979 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1084 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 980 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\"` 981 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
1151# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1047# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1152# - If the file is not specified then unpack will utilize ${A}. 1048# - If the file is not specified then unpack will utilize ${A}.
1153# - If the offset is not specified then we will attempt to extract 1049# - If the offset is not specified then we will attempt to extract
1154# the proper offset from the script itself. 1050# the proper offset from the script itself.
1155unpack_makeself() { 1051unpack_makeself() {
1156 local src="$(find_unpackable_file "$1")" 1052 local src=$(find_unpackable_file "$1")
1157 local skip="$2" 1053 local skip=$2
1158 local exe="$3" 1054 local exe=$3
1159 1055
1056 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1057
1160 local shrtsrc="$(basename "${src}")" 1058 local shrtsrc=$(basename "${src}")
1161 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1059 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1162 if [ -z "${skip}" ] 1060 if [ -z "${skip}" ]
1163 then 1061 then
1164 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1062 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`"
1165 local skip=0 1063 local skip=0
1236check_license() { 1134check_license() {
1237 local lic=$1 1135 local lic=$1
1238 if [ -z "${lic}" ] ; then 1136 if [ -z "${lic}" ] ; then
1239 lic="${PORTDIR}/licenses/${LICENSE}" 1137 lic="${PORTDIR}/licenses/${LICENSE}"
1240 else 1138 else
1241 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1139 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1242 lic="${PORTDIR}/licenses/${src}" 1140 lic="${PORTDIR}/licenses/${lic}"
1243 elif [ -e "${PWD}/${src}" ] ; then 1141 elif [ -e "${PWD}/${lic}" ] ; then
1244 lic="${PWD}/${src}" 1142 lic="${PWD}/${lic}"
1245 elif [ -e "${src}" ] ; then 1143 elif [ -e "${lic}" ] ; then
1246 lic="${src}" 1144 lic="${lic}"
1247 fi
1248 fi 1145 fi
1146 fi
1249 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1147 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1250 local l="`basename ${lic}`" 1148 local l="`basename ${lic}`"
1251 1149
1252 # here is where we check for the licenses the user already 1150 # 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 1151 # accepted ... if we don't find a match, we make the user accept
1254 local shopts=$- 1152 local shopts=$-
1425# displayed and we'll hang out here until: 1323# displayed and we'll hang out here until:
1426# (1) the file is found on a mounted cdrom 1324# (1) the file is found on a mounted cdrom
1427# (2) the user hits CTRL+C 1325# (2) the user hits CTRL+C
1428cdrom_locate_file_on_cd() { 1326cdrom_locate_file_on_cd() {
1429 while [[ -z ${CDROM_ROOT} ]] ; do 1327 while [[ -z ${CDROM_ROOT} ]] ; do
1430 local dir="$(dirname ${@})" 1328 local dir=$(dirname "$*")
1431 local file="$(basename ${@})" 1329 local file=$(basename "$*")
1432 local mline="" 1330 local mline=""
1433 local showedmsg=0 1331 local showedmsg=0
1434 1332
1435 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1333 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do
1436 [[ -d ${mline}/${dir} ]] || continue 1334 [[ -d ${mline}/${dir} ]] || continue
1437 [[ ! -z $(find ${mline}/${dir} -iname ${file} -maxdepth 1) ]] \ 1335 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \
1438 && export CDROM_ROOT=${mline} 1336 && export CDROM_ROOT=${mline}
1439 done 1337 done
1440 1338
1441 if [[ -z ${CDROM_ROOT} ]] ; then 1339 if [[ -z ${CDROM_ROOT} ]] ; then
1442 echo 1340 echo
1457 fi 1355 fi
1458 showedmsg=1 1356 showedmsg=1
1459 fi 1357 fi
1460 einfo "Press return to scan for the cd again" 1358 einfo "Press return to scan for the cd again"
1461 einfo "or hit CTRL+C to abort the emerge." 1359 einfo "or hit CTRL+C to abort the emerge."
1360 echo
1361 einfo "If you are having trouble with the detection"
1362 einfo "of your CD, it is possible that you do not have"
1363 einfo "Joliet support enabled in your kernel. Please"
1364 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1462 read 1365 read
1463 fi 1366 fi
1464 done 1367 done
1465} 1368}
1466 1369
1476# directories and uses the intersection of the lists. 1379# directories and uses the intersection of the lists.
1477# The -u builds a list of po files found in all the 1380# The -u builds a list of po files found in all the
1478# directories and uses the union of the lists. 1381# directories and uses the union of the lists.
1479strip-linguas() { 1382strip-linguas() {
1480 local ls newls 1383 local ls newls
1481 if [ "$1" == "-i" ] || [ "$1" == "-u" ] ; then 1384 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1482 local op="$1"; shift 1385 local op=$1; shift
1483 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1386 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift
1484 local d f 1387 local d f
1485 for d in "$@" ; do 1388 for d in "$@" ; do
1486 if [ "${op}" == "-u" ] ; then 1389 if [[ ${op} == "-u" ]] ; then
1487 newls="${ls}" 1390 newls=${ls}
1488 else 1391 else
1489 newls="" 1392 newls=""
1490 fi 1393 fi
1491 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1394 for f in $(find "$d" -name '*.po' -printf '%f ') ; do
1492 if [ "${op}" == "-i" ] ; then 1395 if [[ ${op} == "-i" ]] ; then
1493 [ "${ls/ ${f} /}" != "${ls}" ] && newls="${newls} ${f}" 1396 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}"
1494 else 1397 else
1495 [ "${ls/ ${f} /}" == "${ls}" ] && newls="${newls} ${f}" 1398 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}"
1496 fi 1399 fi
1497 done 1400 done
1498 ls="${newls}" 1401 ls=${newls}
1499 done 1402 done
1500 ls="${ls//.po}" 1403 ls=${ls//.po}
1501 else 1404 else
1502 ls="$@" 1405 ls=$@
1503 fi 1406 fi
1504 1407
1505 ls=" ${ls} " 1408 ls=" ${ls} "
1506 newls="" 1409 newls=""
1507 for f in ${LINGUAS} ; do 1410 for f in ${LINGUAS} ; do
1508 if [ "${ls/ ${f} /}" != "${ls}" ] ; then 1411 if [[ ${ls/ ${f} /} != ${ls} ]] ; then
1509 newls="${newls} ${f}" 1412 newls="${newls} ${f}"
1510 else 1413 else
1511 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1414 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA"
1512 fi 1415 fi
1513 done 1416 done
1514 if [ -z "${newls}" ] ; then 1417 if [[ -z ${newls} ]] ; then
1515 unset LINGUAS 1418 export LINGUAS=""
1516 else 1419 else
1517 export LINGUAS="${newls}" 1420 export LINGUAS=${newls:1}
1518 fi 1421 fi
1519} 1422}
1520 1423
1521# moved from kernel.eclass since they are generally useful outside of 1424# moved from kernel.eclass since they are generally useful outside of
1522# kernel.eclass -iggy (20041002) 1425# kernel.eclass -iggy (20041002)
1530 while ((i--)) ; do 1433 while ((i--)) ; do
1531 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass" 1434 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1532 done 1435 done
1533 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1436 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1534 case ${ARCH} in 1437 case ${ARCH} in
1535 x86) export ARCH="i386";; 1438 x86) export ARCH="i386";;
1536 amd64) export ARCH="x86_64";; 1439 amd64) export ARCH="x86_64";;
1537 hppa) export ARCH="parisc";; 1440 hppa) export ARCH="parisc";;
1538 mips) export ARCH="mips";; 1441 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! 1442 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}";; 1443 *) export ARCH="${ARCH}";;
1541 esac 1444 esac
1542} 1445}
1543 1446
1544# set's ARCH back to what portage expects 1447# set's ARCH back to what portage expects
1545set_arch_to_portage() { 1448set_arch_to_portage() {
1589 LIB=$1 1492 LIB=$1
1590 1493
1591 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1494 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1592 SONAME=`basename ${LIB}` 1495 SONAME=`basename ${LIB}`
1593 1496
1594 einfo "An old version of an installed library was detected on your system." 1497 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" 1498 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," 1499 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:" 1500 ewarn "you will need to execute the following command:"
1598 einfo " revdep-rebuild --soname ${SONAME}" 1501 ewarn " revdep-rebuild --soname ${SONAME}"
1599 einfo 1502 ewarn
1600 einfo "After doing that, you can safely remove ${LIB}" 1503 ewarn "After doing that, you can safely remove ${LIB}"
1601 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1504 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1602 fi 1505 fi
1603} 1506}
1604 1507
1605# Hack for people to figure out if a package was built with 1508# Hack for people to figure out if a package was built with
1606# certain USE flags 1509# certain USE flags
1644 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null 1547 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
1645 done 1548 done
1646 eend 0 1549 eend 0
1647} 1550}
1648 1551
1649# dopamd [ file ] [ new file ] 1552# dopamd <file> [more files]
1650# 1553#
1651# Install pam auth config file in /etc/pam.d 1554# 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() { 1555dopamd() {
1657 local pamd="$1" newpamd="${2:-$1}"
1658 [[ -z "$1" ]] && die "dopamd requires at least one argument." 1556 [[ -z $1 ]] && die "dopamd requires at least one argument"
1659 1557
1660 use pam || return 0 1558 use pam || return 0
1661 1559
1662 insinto /etc/pam.d 1560 INSDESTTREE=/etc/pam.d \
1663 # these are the default doins options, but be explicit just in case 1561 doins "$@" || die "failed to install $@"
1664 insopts -m 0644 -o root -g root
1665 newins ${pamd} ${newpamd} || die "failed to install ${newpamd}"
1666} 1562}
1563# newpamd <old name> <new name>
1564#
1565# Install pam file <old name> as <new name> in /etc/pam.d
1566newpamd() {
1567 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1568
1569 use pam || return 0
1570
1571 INSDESTTREE=/etc/pam.d \
1572 newins "$1" "$2" || die "failed to install $1 as $2"
1573}
1574
1575# make a wrapper script ...
1576# NOTE: this was originally games_make_wrapper, but I noticed other places where
1577# this could be used, so I have moved it here and made it not games-specific
1578# -- wolf31o2
1579# $1 == wrapper name
1580# $2 == binary to run
1581# $3 == directory to chdir before running binary
1582# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1583# $5 == path for wrapper
1584make_wrapper() {
1585 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1586 local tmpwrapper=$(emktemp)
1587 cat << EOF > "${tmpwrapper}"
1588#!/bin/sh
1589cd "${chdir}"
1590export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1591exec ${bin} "\$@"
1592EOF
1593 chmod go+rx "${tmpwrapper}"
1594 if [ -n "${5}" ]
1595 then
1596 exeinto ${5}
1597 newexe "${tmpwrapper}" "${wrapper}"
1598 else
1599 newbin "${tmpwrapper}" "${wrapper}"
1600 fi
1601}

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

  ViewVC Help
Powered by ViewVC 1.1.20