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

Diff of /eclass/eutils.eclass

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

Revision 1.148 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.148 2005/02/03 23:55:05 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 # Think about changing below to: if [ "${CROSSCOMPILE}" -ne 1 -a -e "/proc/cpuinfo" ]
38 # and dropping the else if you do not plan on adding anything to that
39 # empty block ....
40 # PS: also try to add some quoting, and consider rather using ${foo} than $foo ...
41 if [ $CROSSCOMPILE -eq 1 ] || [ ! -e /proc/cpuinfo ]
42 then
43 :
44 else
45 CPU_FLAGS=$1
46 USER_CPU=`grep "flags" /proc/cpuinfo`
47
48 for flags in `seq 1 ${#CPU_FLAGS[@]}`
49 do
50 if has ${CPU_FLAGS[$flags - 1]} $USER_CPU && ! has ${CPU_FLAGS[$flags - 1]} $USE
51 then
52 ewarn "Your system is ${CPU_FLAGS[$flags - 1]} capable but you don't have it enabled!"
53 ewarn "You might be cross compiling (in this case set CROSSCOMPILE to 1 to disable this warning."
54 fi
55
56 if ! has ${CPU_FLAGS[$flags - 1]} $USER_CPU && has ${CPU_FLAGS[$flags -1]} $USE
57 then
58 ewarn "You have ${CPU_FLAGS[$flags - 1]} support enabled but your processor doesn't"
59 ewarn "Seem to support it! You might be cross compiling or do not have /proc filesystem"
60 ewarn "enabled. If either is the case, set CROSSCOMPILE to 1 to disable this warning."
61 fi
62 done
63 fi
64}
65 18
66# 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
67# 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
68# 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
69# must be an integer greater than zero. 22# must be an integer greater than zero.
111gen_usr_ldscript() { 64gen_usr_ldscript() {
112 local libdir="$(get_libdir)" 65 local libdir="$(get_libdir)"
113 # Just make sure it exists 66 # Just make sure it exists
114 dodir /usr/${libdir} 67 dodir /usr/${libdir}
115 68
69 for lib in "${@}" ; do
116 cat > "${D}/usr/${libdir}/${1}" << END_LDSCRIPT 70 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT
117/* GNU ld script 71 /* GNU ld script
118 Because Gentoo have critical dynamic libraries 72 Since Gentoo has critical dynamic libraries
119 in /lib, and the static versions in /usr/lib, we 73 in /lib, and the static versions in /usr/lib,
120 need to have a "fake" dynamic lib in /usr/lib, 74 we need to have a "fake" dynamic lib in /usr/lib,
121 otherwise we run into linking problems. 75 otherwise we run into linking problems.
122 See bug #4411 on http://bugs.gentoo.org/ for 76
123 more info. */ 77 See bug http://bugs.gentoo.org/4411 for more info.
78 */
124GROUP ( /${libdir}/${1} ) 79 GROUP ( /${libdir}/${lib} )
125END_LDSCRIPT 80 END_LDSCRIPT
126 fperms a+x "/usr/${libdir}/${1}" 81 fperms a+x "/usr/${libdir}/${lib}"
82 done
127} 83}
128 84
129# 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()
130# 87#
131# <azarah@gentoo.org> (11 Nov 2002) 88# <azarah@gentoo.org> (11 Nov 2002)
132# 89#
133draw_line() { 90draw_line() {
134 local i=0 91 local i=0
160EPATCH_SOURCE="${WORKDIR}/patch" 117EPATCH_SOURCE="${WORKDIR}/patch"
161# Default extension for patches 118# Default extension for patches
162EPATCH_SUFFIX="patch.bz2" 119EPATCH_SUFFIX="patch.bz2"
163# Default options for patch 120# Default options for patch
164# 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
165EPATCH_OPTS="-g0" 122# Set --no-backup-if-mismatch so we don't leave '.orig' files behind.
123EPATCH_OPTS="-g0 --no-backup-if-mismatch"
166# 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,
167# and not the full path .. 125# and not the full path ..
168EPATCH_EXCLUDE="" 126EPATCH_EXCLUDE=""
169# Change the printed message for a single patch. 127# Change the printed message for a single patch.
170EPATCH_SINGLE_MSG="" 128EPATCH_SINGLE_MSG=""
129# Change the printed message for multiple patches.
130EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..."
171# Force applying bulk patches even if not following the style: 131# Force applying bulk patches even if not following the style:
172# 132#
173# ??_${ARCH}_foo.${EPATCH_SUFFIX} 133# ??_${ARCH}_foo.${EPATCH_SUFFIX}
174# 134#
175EPATCH_FORCE="no" 135EPATCH_FORCE="no"
213 local PATCH_TARGET="${T}/$$.patch" 173 local PATCH_TARGET="${T}/$$.patch"
214 local PATCH_SUFFIX="" 174 local PATCH_SUFFIX=""
215 local SINGLE_PATCH="no" 175 local SINGLE_PATCH="no"
216 local x="" 176 local x=""
217 177
178 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
179
218 if [ "$#" -gt 1 ] 180 if [ "$#" -gt 1 ]
219 then 181 then
220 local m="" 182 local m=""
221 einfo "${#} patches to apply ..."
222 for m in "$@" ; do 183 for m in "$@" ; do
223 epatch "${m}" 184 epatch "${m}"
224 done 185 done
225 return 0 186 return 0
226 fi 187 fi
280 ;; 241 ;;
281 esac 242 esac
282 243
283 if [ "${SINGLE_PATCH}" = "no" ] 244 if [ "${SINGLE_PATCH}" = "no" ]
284 then 245 then
285 einfo "Applying various patches (bugfixes/updates) ..." 246 einfo "${EPATCH_MULTI_MSG}"
286 fi 247 fi
287 for x in ${EPATCH_SOURCE} 248 for x in ${EPATCH_SOURCE}
288 do 249 do
289 # New ARCH dependant patch naming scheme ... 250 # New ARCH dependant patch naming scheme ...
290 # 251 #
291 # ???_arch_foo.patch 252 # ???_arch_foo.patch
292 # 253 #
293 if [ -f ${x} ] && \ 254 if [ -f ${x} ] && \
294 ([ "${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}" ] || \
295 [ "${EPATCH_FORCE}" = "yes" ]) 256 [ "${EPATCH_FORCE}" = "yes" ])
296 then 257 then
297 local count=0 258 local count=0
298 local popts="${EPATCH_OPTS}" 259 local popts="${EPATCH_OPTS}"
260 local patchname=${x##*/}
299 261
300 if [ -n "${EPATCH_EXCLUDE}" ] 262 if [ -n "${EPATCH_EXCLUDE}" ]
301 then 263 then
302 if [ "`eval echo \$\{EPATCH_EXCLUDE/${x##*/}\}`" != "${EPATCH_EXCLUDE}" ] 264 if [ "${EPATCH_EXCLUDE/${patchname}}" != "${EPATCH_EXCLUDE}" ]
303 then 265 then
304 continue 266 continue
305 fi 267 fi
306 fi 268 fi
307 269
309 then 271 then
310 if [ -n "${EPATCH_SINGLE_MSG}" ] 272 if [ -n "${EPATCH_SINGLE_MSG}" ]
311 then 273 then
312 einfo "${EPATCH_SINGLE_MSG}" 274 einfo "${EPATCH_SINGLE_MSG}"
313 else 275 else
314 einfo "Applying ${x##*/} ..." 276 einfo "Applying ${patchname} ..."
315 fi 277 fi
316 else 278 else
317 einfo " ${x##*/} ..." 279 einfo " ${patchname} ..."
318 fi 280 fi
319 281
320 echo "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 282 echo "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
321 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 283 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
322 284
323 # Allow for prefix to differ ... im lazy, so shoot me :/ 285 # Allow for prefix to differ ... im lazy, so shoot me :/
324 while [ "${count}" -lt 5 ] 286 while [ "${count}" -lt 5 ]
325 do 287 do
326 # Generate some useful debug info ... 288 # Generate some useful debug info ...
327 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 289 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
328 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 290 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
329 291
330 if [ "${PATCH_SUFFIX}" != "patch" ] 292 if [ "${PATCH_SUFFIX}" != "patch" ]
331 then 293 then
332 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 294 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
333 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 295 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
334 else 296 else
335 PATCH_TARGET="${x}" 297 PATCH_TARGET="${x}"
336 fi 298 fi
337 299
338 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 300 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
339 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##*/}
340 302
341 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 303 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
342 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 304 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
343 305
344 if [ "${PATCH_SUFFIX}" != "patch" ] 306 if [ "${PATCH_SUFFIX}" != "patch" ]
345 then 307 then
346 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
347 then 309 then
348 echo 310 echo
349 eerror "Could not extract patch!" 311 eerror "Could not extract patch!"
350 #die "Could not extract patch!" 312 #die "Could not extract patch!"
351 count=5 313 count=5
352 break 314 break
353 fi 315 fi
354 fi 316 fi
355 317
356 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
357 then 319 then
358 draw_line "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 320 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
359 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 321 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
360 echo "ACTUALLY APPLYING ${x##*/} ..." >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 322 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
361 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 323 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
362 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 324 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
363 325
364 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
365 327
366 if [ "$?" -ne 0 ] 328 if [ "$?" -ne 0 ]
367 then 329 then
368 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##*/}
369 echo 331 echo
370 eerror "A dry-run of patch command succeeded, but actually" 332 eerror "A dry-run of patch command succeeded, but actually"
371 eerror "applying the patch failed!" 333 eerror "applying the patch failed!"
372 #die "Real world sux compared to the dreamworld!" 334 #die "Real world sux compared to the dreamworld!"
373 count=5 335 count=5
374 fi 336 fi
375 337
376 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 338 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
377 339
378 break 340 break
379 fi 341 fi
380 342
381 count=$((count + 1)) 343 count=$((count + 1))
387 fi 349 fi
388 350
389 if [ "${count}" -eq 5 ] 351 if [ "${count}" -eq 5 ]
390 then 352 then
391 echo 353 echo
392 eerror "Failed Patch: ${x##*/}!" 354 eerror "Failed Patch: ${patchname} !"
355 eerror " ( ${PATCH_TARGET} )"
393 eerror 356 eerror
394 eerror "Include in your bugreport the contents of:" 357 eerror "Include in your bugreport the contents of:"
395 eerror 358 eerror
396 eerror " ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}" 359 eerror " ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}"
397 echo 360 echo
398 die "Failed Patch: ${x##*/}!" 361 die "Failed Patch: ${patchname}!"
399 fi 362 fi
400 363
401 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 364 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
402 365
403 eend 0 366 eend 0
404 fi 367 fi
405 done 368 done
406 if [ "${SINGLE_PATCH}" = "no" ] 369 if [ "${SINGLE_PATCH}" = "no" ]
407 then 370 then
408 einfo "Done with patching" 371 einfo "Done with patching"
409 fi 372 fi
410} 373}
411 374
412# This function return true if we are using the NPTL pthreads
413# implementation.
414#
415# <azarah@gentoo.org> (06 March 2003)
416#
417have_NPTL() {
418 cat > ${T}/test-nptl.c <<-"END"
419 #define _XOPEN_SOURCE
420 #include <unistd.h>
421 #include <stdio.h>
422
423 int main()
424 {
425 char buf[255];
426 char *str = buf;
427
428 confstr(_CS_GNU_LIBPTHREAD_VERSION, str, 255);
429 if (NULL != str) {
430 printf("%s\n", str);
431 if (NULL != strstr(str, "NPTL"))
432 return 0;
433 }
434
435 return 1;
436 }
437 END
438
439 einfon "Checking for _CS_GNU_LIBPTHREAD_VERSION support in glibc ..."
440 if gcc -o ${T}/nptl ${T}/test-nptl.c &> /dev/null
441 then
442 echo "yes"
443 einfon "Checking what PTHREADS implementation we have ..."
444 if ${T}/nptl
445 then
446 return 0
447 else
448 return 1
449 fi
450 else
451 echo "no"
452 fi
453
454 return 1
455}
456
457# This function check how many cpu's are present, and then set
458# -j in MAKEOPTS accordingly.
459#
460# Thanks to nall <nall@gentoo.org> for this.
461#
462get_number_of_jobs() {
463 local jobs=0
464
465 if [ ! -r /proc/cpuinfo ]
466 then
467 return 1
468 fi
469
470 # This bit is from H?kan Wessberg <nacka-gentoo@refug.org>, bug #13565.
471 if [ "`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | wc -l`" -gt 0 ]
472 then
473 ADMINOPTS="`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | cut -d= -f2 | sed 's/\"//g'`"
474 ADMINPARAM="`echo ${ADMINOPTS} | gawk '{match($0, /-j *[0-9]*/, opt); print opt[0]}'`"
475 ADMINPARAM="${ADMINPARAM/-j}"
476 fi
477
478 export MAKEOPTS="`echo ${MAKEOPTS} | sed -e 's:-j *[0-9]*::g'`"
479
480 if [ "${ARCH}" = "amd64" -o "${ARCH}" = "x86" -o "${ARCH}" = "hppa" -o \
481 "${ARCH}" = "arm" -o "${ARCH}" = "mips" -o "${ARCH}" = "ia64" ]
482 then
483 # these archs will always have "[Pp]rocessor"
484 jobs="$((`grep -c ^[Pp]rocessor /proc/cpuinfo` * 2))"
485
486 elif [ "${ARCH}" = "sparc" -o "${ARCH}" = "sparc64" ]
487 then
488 # sparc always has "ncpus active"
489 jobs="$((`grep "^ncpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
490
491 elif [ "${ARCH}" = "alpha" ]
492 then
493 # alpha has "cpus active", but only when compiled with SMP
494 if [ "`grep -c "^cpus active" /proc/cpuinfo`" -eq 1 ]
495 then
496 jobs="$((`grep "^cpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
497 else
498 jobs=2
499 fi
500
501 elif [ "${ARCH}" = "ppc" -o "${ARCH}" = "ppc64" ]
502 then
503 # ppc has "processor", but only when compiled with SMP
504 if [ "`grep -c "^processor" /proc/cpuinfo`" -eq 1 ]
505 then
506 jobs="$((`grep -c ^processor /proc/cpuinfo` * 2))"
507 else
508 jobs=2
509 fi
510 elif [ "${ARCH}" = "s390" ]
511 then
512 # s390 has "# processors : "
513 jobs="$((`grep "^\# processors" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
514 else
515 jobs="$((`grep -c ^cpu /proc/cpuinfo` * 2))"
516 die "Unknown ARCH -- ${ARCH}!"
517 fi
518
519 # Make sure the number is valid ...
520 if [ "${jobs}" -lt 1 ]
521 then
522 jobs=1
523 fi
524
525 if [ -n "${ADMINPARAM}" ]
526 then
527 if [ "${jobs}" -gt "${ADMINPARAM}" ]
528 then
529 einfo "Setting make jobs to \"-j${ADMINPARAM}\" to ensure successful merge ..."
530 export MAKEOPTS="${MAKEOPTS} -j${ADMINPARAM}"
531 else
532 einfo "Setting make jobs to \"-j${jobs}\" to ensure successful merge ..."
533 export MAKEOPTS="${MAKEOPTS} -j${jobs}"
534 fi
535 fi
536}
537
538# Cheap replacement for when debianutils (and thus mktemp) 375# Cheap replacement for when debianutils (and thus mktemp)
539# does not exist on the users system 376# does not exist on the users system
540# vapier@gentoo.org 377# vapier@gentoo.org
541# 378#
542# Takes just 1 optional parameter (the directory to create tmpfile in) 379# Takes just 1 optional parameter (the directory to create tmpfile in)
543emktemp() { 380emktemp() {
544 local exe="touch" 381 local exe="touch"
545 [ "$1" == "-d" ] && exe="mkdir" && shift 382 [[ $1 == -d ]] && exe="mkdir" && shift
546 local topdir="$1" 383 local topdir=$1
547 384
548 if [ -z "${topdir}" ] 385 if [[ -z ${topdir} ]] ; then
549 then
550 [ -z "${T}" ] \ 386 [[ -z ${T} ]] \
551 && topdir="/tmp" \ 387 && topdir="/tmp" \
552 || topdir="${T}" 388 || topdir=${T}
553 fi 389 fi
554 390
555 if [ -z "$(type -p mktemp)" ] 391 if [[ -z $(type -p mktemp) ]] ; then
556 then
557 local tmp=/ 392 local tmp=/
558 while [ -e "${tmp}" ] ; do 393 while [[ -e ${tmp} ]] ; do
559 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 394 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
560 done 395 done
561 ${exe} "${tmp}" 396 ${exe} "${tmp}" || ${exe} -p "${tmp}"
562 echo "${tmp}" 397 echo "${tmp}"
563 else 398 else
564 [ "${exe}" == "touch" ] \ 399 [[ ${exe} == "touch" ]] \
565 && exe="-p" \ 400 && exe="-p" \
566 || exe="-d" 401 || exe="-d"
567 mktemp ${exe} "${topdir}" 402 mktemp ${exe} "${topdir}"
568 fi 403 fi
569} 404}
573# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 408# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
574# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 409# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
575# 410#
576# egetent(database, key) 411# egetent(database, key)
577egetent() { 412egetent() {
578 if useq ppc-macos ; then 413 if [[ "${USERLAND}" == "Darwin" ]] ; then
579 case "$2" in 414 case "$2" in
580 *[!0-9]*) # Non numeric 415 *[!0-9]*) # Non numeric
581 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 416 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
582 ;; 417 ;;
583 *) # Numeric 418 *) # Numeric
584 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 419 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
585 ;; 420 ;;
586 esac 421 esac
587 elif useq x86-fbsd ; then 422 elif [[ "${USERLAND}" == "BSD" ]] ; then
588 local action 423 local action
589 if [ "$1" == "passwd" ] 424 if [ "$1" == "passwd" ]
590 then 425 then
591 action="user" 426 action="user"
592 else 427 else
612# homedir: /dev/null 447# homedir: /dev/null
613# groups: none 448# groups: none
614# extra: comment of 'added by portage for ${PN}' 449# extra: comment of 'added by portage for ${PN}'
615enewuser() { 450enewuser() {
616 # get the username 451 # get the username
617 local euser="$1"; shift 452 local euser=$1; shift
618 if [ -z "${euser}" ] 453 if [[ -z ${euser} ]] ; then
619 then
620 eerror "No username specified !" 454 eerror "No username specified !"
621 die "Cannot call enewuser without a username" 455 die "Cannot call enewuser without a username"
622 fi 456 fi
623 457
624 # lets see if the username already exists 458 # lets see if the username already exists
625 if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ] 459 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then
626 then
627 return 0 460 return 0
628 fi 461 fi
629 einfo "Adding user '${euser}' to your system ..." 462 einfo "Adding user '${euser}' to your system ..."
630 463
631 # options to pass to useradd 464 # options to pass to useradd
632 local opts= 465 local opts=
633 466
634 # handle uid 467 # handle uid
635 local euid="$1"; shift 468 local euid=$1; shift
636 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] 469 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then
637 then
638 if [ "${euid}" -gt 0 ] 470 if [[ ${euid} -gt 0 ]] ; then
639 then
640 if [ ! -z "`egetent passwd ${euid}`" ] 471 if [[ ! -z $(egetent passwd ${euid}) ]] ; then
641 then
642 euid="next" 472 euid="next"
643 fi 473 fi
644 else 474 else
645 eerror "Userid given but is not greater than 0 !" 475 eerror "Userid given but is not greater than 0 !"
646 die "${euid} is not a valid UID" 476 die "${euid} is not a valid UID"
647 fi 477 fi
648 else 478 else
649 euid="next" 479 euid="next"
650 fi 480 fi
651 if [ "${euid}" == "next" ] 481 if [[ ${euid} == "next" ]] ; then
652 then 482 for euid in $(seq 101 999) ; do
653 local pwrange
654 if [ "${USERLAND}" == "BSD" ] ; then
655 pwrange="`jot 898 101`"
656 else
657 pwrange="`seq 101 999`"
658 fi
659 for euid in ${pwrange} ; do
660 [ -z "`egetent passwd ${euid}`" ] && break 483 [[ -z $(egetent passwd ${euid}) ]] && break
661 done 484 done
662 fi 485 fi
663 opts="${opts} -u ${euid}" 486 opts="${opts} -u ${euid}"
664 einfo " - Userid: ${euid}" 487 einfo " - Userid: ${euid}"
665 488
666 # handle shell 489 # handle shell
667 local eshell="$1"; shift 490 local eshell=$1; shift
668 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ] 491 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
669 then
670 if [ ! -e "${eshell}" ] 492 if [[ ! -e ${eshell} ]] ; then
671 then
672 eerror "A shell was specified but it does not exist !" 493 eerror "A shell was specified but it does not exist !"
673 die "${eshell} does not exist" 494 die "${eshell} does not exist"
674 fi 495 fi
675 else 496 else
676 if [ "${USERLAND}" == "BSD" ] 497 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null; do
677 then 498 [[ -x ${ROOT}${shell} ]] && break;
678 eshell="/usr/bin/false" 499 done
679 else 500
680 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"
681 fi 504 fi
505
506 eshell=${shell}
682 fi 507 fi
683 einfo " - Shell: ${eshell}" 508 einfo " - Shell: ${eshell}"
684 opts="${opts} -s ${eshell}" 509 opts="${opts} -s ${eshell}"
685 510
686 # handle homedir 511 # handle homedir
687 local ehome="$1"; shift 512 local ehome=$1; shift
688 if [ -z "${ehome}" ] && [ "${eshell}" != "-1" ] 513 if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then
689 then
690 ehome="/dev/null" 514 ehome="/dev/null"
691 fi 515 fi
692 einfo " - Home: ${ehome}" 516 einfo " - Home: ${ehome}"
693 opts="${opts} -d ${ehome}" 517 opts="${opts} -d ${ehome}"
694 518
695 # handle groups 519 # handle groups
696 local egroups="$1"; shift 520 local egroups=$1; shift
697 if [ ! -z "${egroups}" ] 521 if [[ ! -z ${egroups} ]] ; then
698 then
699 local oldifs="${IFS}" 522 local oldifs=${IFS}
700 local defgroup="" exgroups="" 523 local defgroup="" exgroups=""
701 524
702 export IFS="," 525 export IFS=","
703 for g in ${egroups} 526 for g in ${egroups} ; do
704 do
705 export IFS="${oldifs}" 527 export IFS=${oldifs}
706 if [ -z "`egetent group \"${g}\"`" ] 528 if [[ -z $(egetent group "${g}") ]] ; then
707 then
708 eerror "You must add group ${g} to the system first" 529 eerror "You must add group ${g} to the system first"
709 die "${g} is not a valid GID" 530 die "${g} is not a valid GID"
710 fi 531 fi
711 if [ -z "${defgroup}" ] 532 if [[ -z ${defgroup} ]] ; then
712 then
713 defgroup="${g}" 533 defgroup=${g}
714 else 534 else
715 exgroups="${exgroups},${g}" 535 exgroups="${exgroups},${g}"
716 fi 536 fi
717 export IFS="," 537 export IFS=","
718 done 538 done
719 export IFS="${oldifs}" 539 export IFS=${oldifs}
720 540
721 opts="${opts} -g ${defgroup}" 541 opts="${opts} -g ${defgroup}"
722 if [ ! -z "${exgroups}" ] 542 if [[ ! -z ${exgroups} ]] ; then
723 then
724 opts="${opts} -G ${exgroups:1}" 543 opts="${opts} -G ${exgroups:1}"
725 fi 544 fi
726 else 545 else
727 egroups="(none)" 546 egroups="(none)"
728 fi 547 fi
729 einfo " - Groups: ${egroups}" 548 einfo " - Groups: ${egroups}"
730 549
731 # handle extra and add the user 550 # handle extra and add the user
732 local eextra="$@"
733 local oldsandbox="${SANDBOX_ON}" 551 local oldsandbox=${SANDBOX_ON}
734 export SANDBOX_ON="0" 552 export SANDBOX_ON="0"
735 if useq ppc-macos 553 case ${USERLAND} in
736 then 554 Darwin)
737 ### Make the user 555 ### Make the user
738 if [ -z "${eextra}" ] 556 if [[ -z $@ ]] ; then
739 then
740 dscl . create /users/${euser} uid ${euid} 557 dscl . create /users/${euser} uid ${euid}
741 dscl . create /users/${euser} shell ${eshell} 558 dscl . create /users/${euser} shell ${eshell}
742 dscl . create /users/${euser} home ${ehome} 559 dscl . create /users/${euser} home ${ehome}
743 dscl . create /users/${euser} realname "added by portage for ${PN}" 560 dscl . create /users/${euser} realname "added by portage for ${PN}"
744 ### Add the user to the groups specified 561 ### Add the user to the groups specified
745 local oldifs="${IFS}" 562 local oldifs=${IFS}
746 export IFS="," 563 export IFS=","
747 for g in ${egroups} 564 for g in ${egroups} ; do
748 do
749 dscl . merge /groups/${g} users ${euser} 565 dscl . merge /groups/${g} users ${euser}
750 done 566 done
751 export IFS="${oldifs}" 567 export IFS=${oldifs}
752 else 568 else
753 einfo "Extra options are not supported on macos yet" 569 einfo "Extra options are not supported on Darwin yet"
754 einfo "Please report the ebuild along with the info below" 570 einfo "Please report the ebuild along with the info below"
755 einfo "eextra: ${eextra}" 571 einfo "eextra: $@"
756 die "Required function missing" 572 die "Required function missing"
757 fi 573 fi
758 elif use x86-fbsd ; then 574 ;;
759 if [ -z "${eextra}" ] 575 BSD)
760 then 576 if [[ -z $@ ]] ; then
761 pw useradd ${euser} ${opts} \ 577 pw useradd ${euser} ${opts} \
762 -c "added by portage for ${PN}" \ 578 -c "added by portage for ${PN}" \
763 die "enewuser failed" 579 die "enewuser failed"
764 else 580 else
765 einfo " - Extra: ${eextra}" 581 einfo " - Extra: $@"
766 pw useradd ${euser} ${opts} \ 582 pw useradd ${euser} ${opts} \
767 -c ${eextra} || die "enewuser failed" 583 "$@" || die "enewuser failed"
768 fi 584 fi
769 else 585 ;;
770 if [ -z "${eextra}" ] 586 *)
771 then 587 if [[ -z $@ ]] ; then
772 useradd ${opts} ${euser} \ 588 useradd ${opts} ${euser} \
773 -c "added by portage for ${PN}" \ 589 -c "added by portage for ${PN}" \
774 || die "enewuser failed" 590 || die "enewuser failed"
775 else 591 else
776 einfo " - Extra: ${eextra}" 592 einfo " - Extra: $@"
777 useradd ${opts} ${euser} ${eextra} \ 593 useradd ${opts} ${euser} "$@" \
778 || die "enewuser failed" 594 || die "enewuser failed"
779 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}"
780 fi 604 fi
605
781 export SANDBOX_ON="${oldsandbox}" 606 export SANDBOX_ON=${oldsandbox}
782
783 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ]
784 then
785 einfo " - Creating ${ehome} in ${D}"
786 dodir ${ehome}
787 fowners ${euser} ${ehome}
788 fperms 755 ${ehome}
789 fi
790} 607}
791 608
792# Simplify/standardize adding groups to the system 609# Simplify/standardize adding groups to the system
793# vapier@gentoo.org 610# vapier@gentoo.org
794# 611#
823 then 640 then
824 if [ "${egid}" -gt 0 ] 641 if [ "${egid}" -gt 0 ]
825 then 642 then
826 if [ -z "`egetent group ${egid}`" ] 643 if [ -z "`egetent group ${egid}`" ]
827 then 644 then
828 if useq ppc-macos ; then 645 if [[ "${USERLAND}" == "Darwin" ]]; then
829 opts="${opts} ${egid}" 646 opts="${opts} ${egid}"
830 else 647 else
831 opts="${opts} -g ${egid}" 648 opts="${opts} -g ${egid}"
832 fi 649 fi
833 else 650 else
847 opts="${opts} ${eextra}" 664 opts="${opts} ${eextra}"
848 665
849 # add the group 666 # add the group
850 local oldsandbox="${SANDBOX_ON}" 667 local oldsandbox="${SANDBOX_ON}"
851 export SANDBOX_ON="0" 668 export SANDBOX_ON="0"
852 if useq ppc-macos ; then 669 if [[ "${USERLAND}" == "Darwin" ]]; then
853 if [ ! -z "${eextra}" ]; 670 if [ ! -z "${eextra}" ];
854 then 671 then
855 einfo "Extra options are not supported on macos yet" 672 einfo "Extra options are not supported on Darwin/OS X yet"
856 einfo "Please report the ebuild along with the info below" 673 einfo "Please report the ebuild along with the info below"
857 einfo "eextra: ${eextra}" 674 einfo "eextra: ${eextra}"
858 die "Required function missing" 675 die "Required function missing"
859 fi 676 fi
860 677
861 # If we need the next available 678 # If we need the next available
862 case ${egid} in 679 case ${egid} in
863 *[!0-9]*) # Non numeric 680 *[!0-9]*) # Non numeric
864 for egid in `jot 898 101`; do 681 for egid in $(seq 101 999); do
865 [ -z "`egetent group ${egid}`" ] && break 682 [ -z "`egetent group ${egid}`" ] && break
866 done 683 done
867 esac 684 esac
868 dscl . create /groups/${egroup} gid ${egid} 685 dscl . create /groups/${egroup} gid ${egid}
869 dscl . create /groups/${egroup} passwd '*' 686 dscl . create /groups/${egroup} passwd '*'
870 elif use x86-fbsd ; then 687 elif [[ "${USERLAND}" == "BSD" ]] ; then
871 case ${egid} in 688 case ${egid} in
872 *[!0-9]*) # Non numeric 689 *[!0-9]*) # Non numeric
873 for egid in `jot 898 101`; do 690 for egid in $(seq 101 999); do
874 [ -z "`egetent group ${egid}`" ] && break 691 [ -z "`egetent group ${egid}`" ] && break
875 done 692 done
876 esac 693 esac
877 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 694 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
878 else 695 else
910# name: the name that will show up in the menu 727# name: the name that will show up in the menu
911# icon: give your little like a pretty little icon ... 728# icon: give your little like a pretty little icon ...
912# this can be relative (to /usr/share/pixmaps) or 729# this can be relative (to /usr/share/pixmaps) or
913# a full path to an icon 730# a full path to an icon
914# type: what kind of application is this ? for categories: 731# type: what kind of application is this ? for categories:
915# http://www.freedesktop.org/standards/menu-spec/ 732# http://www.freedesktop.org/Standards/desktop-entry-spec
916# path: if your app needs to startup in a specific dir 733# path: if your app needs to startup in a specific dir
917make_desktop_entry() { 734make_desktop_entry() {
918 [ -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
919 736
920 local exec="${1}" 737 local exec=${1}
921 local name="${2:-${PN}}" 738 local name=${2:-${PN}}
922 local icon="${3:-${PN}.png}" 739 local icon=${3:-${PN}.png}
923 local type="${4}" 740 local type=${4}
924 local subdir="${6}" 741 local path=${5}
925 local path="${5:-${GAMES_BINDIR}}" 742
926 if [ -z "${type}" ] 743 if [[ -z ${type} ]] ; then
927 then 744 local catmaj=${CATEGORY%%-*}
928 case ${CATEGORY} in 745 local catmin=${CATEGORY##*-}
929 "app-emulation") 746 case ${catmaj} in
930 type=Emulator 747 app)
931 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
932 ;; 761 ;;
933 "games-"*) 762
934 type=Game 763 dev)
935 subdir="Games" 764 type="Development"
936 ;; 765 ;;
937 "net-"*) 766
938 type=Network 767 games)
939 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}"
940 ;; 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
941 *) 837 *)
942 type= 838 type=
943 subdir=
944 ;; 839 ;;
945 esac 840 esac
946 fi 841 fi
842 if [ "${SLOT}" == "0" ] ; then
843 local desktop_name="${PN}"
844 else
845 local desktop_name="${PN}-${SLOT}"
846 fi
947 local desktop="${T}/${exec}.desktop" 847 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
948 848
949echo "[Desktop Entry] 849echo "[Desktop Entry]
950Encoding=UTF-8 850Encoding=UTF-8
951Version=0.9.2 851Version=0.9.2
952Name=${name} 852Name=${name}
968# make_desktop_entry(<title>, <command>) 868# make_desktop_entry(<title>, <command>)
969# title: File to execute to start the Window Manager 869# title: File to execute to start the Window Manager
970# command: Name of the Window Manager 870# command: Name of the Window Manager
971 871
972make_session_desktop() { 872make_session_desktop() {
973
974 [ -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
975 [ -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
976 875
977 local title="${1}" 876 local title=$1
978 local command="${2}" 877 local command=$2
979 local desktop="${T}/${wm}.desktop" 878 local desktop=${T}/${wm}.desktop
980 879
981echo "[Desktop Entry] 880echo "[Desktop Entry]
982Encoding=UTF-8 881Encoding=UTF-8
983Name=${title} 882Name=${title}
984Comment=This session logs you into ${title} 883Comment=This session logs you into ${title}
986TryExec=${command} 885TryExec=${command}
987Type=Application" > "${desktop}" 886Type=Application" > "${desktop}"
988 887
989 insinto /usr/share/xsessions 888 insinto /usr/share/xsessions
990 doins "${desktop}" 889 doins "${desktop}"
991
992 return 0
993} 890}
994 891
995domenu() { 892domenu() {
996 local i 893 local i j
997 local j
998 insinto /usr/share/applications 894 insinto /usr/share/applications
999 for i in ${@} 895 for i in "$@" ; do
1000 do
1001 if [ -f "${i}" ]; 896 if [[ -f ${i} ]] ; then
1002 then
1003 doins ${i} 897 doins "${i}"
1004 elif [ -d "${i}" ]; 898 elif [[ -d ${i} ]] ; then
1005 then
1006 for j in ${i}/*.desktop 899 for j in "${i}"/*.desktop ; do
1007 do
1008 doins ${j} 900 doins "${j}"
1009 done 901 done
1010 fi 902 fi
1011 done 903 done
1012} 904}
905newmenu() {
906 insinto /usr/share/applications
907 newins "$1" "$2"
908}
1013 909
1014doicon() { 910doicon() {
1015 local i 911 local i j
1016 local j
1017 insinto /usr/share/pixmaps 912 insinto /usr/share/pixmaps
1018 for i in ${@} 913 for i in "$@" ; do
1019 do
1020 if [ -f "${i}" ]; 914 if [[ -f ${i} ]] ; then
1021 then
1022 doins ${i} 915 doins "${i}"
1023 elif [ -d "${i}" ]; 916 elif [[ -d ${i} ]] ; then
1024 then
1025 for j in ${i}/*.png 917 for j in "${i}"/*.png ; do
1026 do
1027 doins ${j} 918 doins "${j}"
1028 done 919 done
1029 fi 920 fi
1030 done 921 done
922}
923newicon() {
924 insinto /usr/share/pixmaps
925 newins "$1" "$2"
1031} 926}
1032 927
1033############################################################## 928##############################################################
1034# END: Handle .desktop files and menu entries # 929# END: Handle .desktop files and menu entries #
1035############################################################## 930##############################################################
1036 931
1037 932
1038# for internal use only (unpack_pdv and unpack_makeself) 933# for internal use only (unpack_pdv and unpack_makeself)
1039find_unpackable_file() { 934find_unpackable_file() {
1040 local src="$1" 935 local src=$1
1041 if [ -z "${src}" ] 936 if [[ -z ${src} ]] ; then
1042 then
1043 src="${DISTDIR}/${A}" 937 src=${DISTDIR}/${A}
1044 else 938 else
1045 if [ -e "${DISTDIR}/${src}" ] 939 if [[ -e ${DISTDIR}/${src} ]] ; then
1046 then
1047 src="${DISTDIR}/${src}" 940 src=${DISTDIR}/${src}
1048 elif [ -e "${PWD}/${src}" ] 941 elif [[ -e ${PWD}/${src} ]] ; then
1049 then
1050 src="${PWD}/${src}" 942 src=${PWD}/${src}
1051 elif [ -e "${src}" ] 943 elif [[ -e ${src} ]] ; then
1052 then
1053 src="${src}" 944 src=${src}
1054 fi
1055 fi 945 fi
1056 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 946 fi
947 [[ ! -e ${src} ]] && return 1
1057 echo "${src}" 948 echo "${src}"
1058} 949}
1059 950
1060# Unpack those pesky pdv generated files ... 951# Unpack those pesky pdv generated files ...
1061# They're self-unpacking programs with the binary package stuffed in 952# They're self-unpacking programs with the binary package stuffed in
1076# lseek 967# lseek
1077# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 968# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
1078# lseek(3, -4, SEEK_END) = 2981250 969# lseek(3, -4, SEEK_END) = 2981250
1079# 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.
1080unpack_pdv() { 971unpack_pdv() {
1081 local src="`find_unpackable_file $1`" 972 local src=$(find_unpackable_file $1)
1082 local sizeoff_t="$2" 973 local sizeoff_t=$2
1083 974
975 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1084 [ -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 :("
1085 977
1086 local shrtsrc="`basename ${src}`" 978 local shrtsrc="`basename ${src}`"
1087 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 979 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1088 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 980 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
1089 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\"`
1155# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1047# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1156# - If the file is not specified then unpack will utilize ${A}. 1048# - If the file is not specified then unpack will utilize ${A}.
1157# - 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
1158# the proper offset from the script itself. 1050# the proper offset from the script itself.
1159unpack_makeself() { 1051unpack_makeself() {
1160 local src="$(find_unpackable_file "$1")" 1052 local src=$(find_unpackable_file "$1")
1161 local skip="$2" 1053 local skip=$2
1162 local exe="$3" 1054 local exe=$3
1163 1055
1056 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1057
1164 local shrtsrc="$(basename "${src}")" 1058 local shrtsrc=$(basename "${src}")
1165 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1059 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1166 if [ -z "${skip}" ] 1060 if [ -z "${skip}" ]
1167 then 1061 then
1168 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1062 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`"
1169 local skip=0 1063 local skip=0
1240check_license() { 1134check_license() {
1241 local lic=$1 1135 local lic=$1
1242 if [ -z "${lic}" ] ; then 1136 if [ -z "${lic}" ] ; then
1243 lic="${PORTDIR}/licenses/${LICENSE}" 1137 lic="${PORTDIR}/licenses/${LICENSE}"
1244 else 1138 else
1245 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1139 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1246 lic="${PORTDIR}/licenses/${src}" 1140 lic="${PORTDIR}/licenses/${lic}"
1247 elif [ -e "${PWD}/${src}" ] ; then 1141 elif [ -e "${PWD}/${lic}" ] ; then
1248 lic="${PWD}/${src}" 1142 lic="${PWD}/${lic}"
1249 elif [ -e "${src}" ] ; then 1143 elif [ -e "${lic}" ] ; then
1250 lic="${src}" 1144 lic="${lic}"
1251 fi
1252 fi 1145 fi
1146 fi
1253 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1147 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1254 local l="`basename ${lic}`" 1148 local l="`basename ${lic}`"
1255 1149
1256 # here is where we check for the licenses the user already 1150 # here is where we check for the licenses the user already
1257 # 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
1258 local shopts=$- 1152 local shopts=$-
1429# displayed and we'll hang out here until: 1323# displayed and we'll hang out here until:
1430# (1) the file is found on a mounted cdrom 1324# (1) the file is found on a mounted cdrom
1431# (2) the user hits CTRL+C 1325# (2) the user hits CTRL+C
1432cdrom_locate_file_on_cd() { 1326cdrom_locate_file_on_cd() {
1433 while [[ -z ${CDROM_ROOT} ]] ; do 1327 while [[ -z ${CDROM_ROOT} ]] ; do
1434 local dir="$(dirname ${@})" 1328 local dir=$(dirname "$*")
1435 local file="$(basename ${@})" 1329 local file=$(basename "$*")
1436 local mline="" 1330 local mline=""
1437 local showedmsg=0 1331 local showedmsg=0
1438 1332
1439 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
1440 [[ -d ${mline}/${dir} ]] || continue 1334 [[ -d ${mline}/${dir} ]] || continue
1441 [[ ! -z $(find ${mline}/${dir} -iname ${file} -maxdepth 1) ]] \ 1335 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \
1442 && export CDROM_ROOT=${mline} 1336 && export CDROM_ROOT=${mline}
1443 done 1337 done
1444 1338
1445 if [[ -z ${CDROM_ROOT} ]] ; then 1339 if [[ -z ${CDROM_ROOT} ]] ; then
1446 echo 1340 echo
1461 fi 1355 fi
1462 showedmsg=1 1356 showedmsg=1
1463 fi 1357 fi
1464 einfo "Press return to scan for the cd again" 1358 einfo "Press return to scan for the cd again"
1465 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."
1466 read 1365 read
1467 fi 1366 fi
1468 done 1367 done
1469} 1368}
1470 1369
1480# directories and uses the intersection of the lists. 1379# directories and uses the intersection of the lists.
1481# 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
1482# directories and uses the union of the lists. 1381# directories and uses the union of the lists.
1483strip-linguas() { 1382strip-linguas() {
1484 local ls newls 1383 local ls newls
1485 if [ "$1" == "-i" ] || [ "$1" == "-u" ] ; then 1384 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1486 local op="$1"; shift 1385 local op=$1; shift
1487 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1386 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift
1488 local d f 1387 local d f
1489 for d in "$@" ; do 1388 for d in "$@" ; do
1490 if [ "${op}" == "-u" ] ; then 1389 if [[ ${op} == "-u" ]] ; then
1491 newls="${ls}" 1390 newls=${ls}
1492 else 1391 else
1493 newls="" 1392 newls=""
1494 fi 1393 fi
1495 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1394 for f in $(find "$d" -name '*.po' -printf '%f ') ; do
1496 if [ "${op}" == "-i" ] ; then 1395 if [[ ${op} == "-i" ]] ; then
1497 [ "${ls/ ${f} /}" != "${ls}" ] && newls="${newls} ${f}" 1396 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}"
1498 else 1397 else
1499 [ "${ls/ ${f} /}" == "${ls}" ] && newls="${newls} ${f}" 1398 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}"
1500 fi 1399 fi
1501 done 1400 done
1502 ls="${newls}" 1401 ls=${newls}
1503 done 1402 done
1504 ls="${ls//.po}" 1403 ls=${ls//.po}
1505 else 1404 else
1506 ls="$@" 1405 ls=$@
1507 fi 1406 fi
1508 1407
1509 ls=" ${ls} " 1408 ls=" ${ls} "
1510 newls="" 1409 newls=""
1511 for f in ${LINGUAS} ; do 1410 for f in ${LINGUAS} ; do
1512 if [ "${ls/ ${f} /}" != "${ls}" ] ; then 1411 if [[ ${ls/ ${f} /} != ${ls} ]] ; then
1513 newls="${newls} ${f}" 1412 newls="${newls} ${f}"
1514 else 1413 else
1515 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1414 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA"
1516 fi 1415 fi
1517 done 1416 done
1518 if [ -z "${newls}" ] ; then 1417 if [[ -z ${newls} ]] ; then
1519 unset LINGUAS 1418 export LINGUAS=""
1520 else 1419 else
1521 export LINGUAS="${newls}" 1420 export LINGUAS=${newls:1}
1522 fi 1421 fi
1523} 1422}
1524 1423
1525# moved from kernel.eclass since they are generally useful outside of 1424# moved from kernel.eclass since they are generally useful outside of
1526# kernel.eclass -iggy (20041002) 1425# kernel.eclass -iggy (20041002)
1534 while ((i--)) ; do 1433 while ((i--)) ; do
1535 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass" 1434 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1536 done 1435 done
1537 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1436 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1538 case ${ARCH} in 1437 case ${ARCH} in
1539 x86) export ARCH="i386";; 1438 x86) export ARCH="i386";;
1540 amd64) export ARCH="x86_64";; 1439 amd64) export ARCH="x86_64";;
1541 hppa) export ARCH="parisc";; 1440 hppa) export ARCH="parisc";;
1542 mips) export ARCH="mips";; 1441 mips) export ARCH="mips";;
1543 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!
1544 *) export ARCH="${ARCH}";; 1443 *) export ARCH="${ARCH}";;
1545 esac 1444 esac
1546} 1445}
1547 1446
1548# set's ARCH back to what portage expects 1447# set's ARCH back to what portage expects
1549set_arch_to_portage() { 1448set_arch_to_portage() {
1593 LIB=$1 1492 LIB=$1
1594 1493
1595 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1494 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1596 SONAME=`basename ${LIB}` 1495 SONAME=`basename ${LIB}`
1597 1496
1598 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."
1599 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"
1600 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,"
1601 einfo "you will need to execute the following command:" 1500 ewarn "you will need to execute the following command:"
1602 einfo " revdep-rebuild --soname ${SONAME}" 1501 ewarn " revdep-rebuild --soname ${SONAME}"
1603 einfo 1502 ewarn
1604 einfo "After doing that, you can safely remove ${LIB}" 1503 ewarn "After doing that, you can safely remove ${LIB}"
1605 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1504 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1606 fi 1505 fi
1607} 1506}
1608 1507
1609# 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
1610# certain USE flags 1509# certain USE flags
1648 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
1649 done 1548 done
1650 eend 0 1549 eend 0
1651} 1550}
1652 1551
1653# dopamd [ file ] [ new file ] 1552# dopamd <file> [more files]
1654# 1553#
1655# Install pam auth config file in /etc/pam.d 1554# Install pam auth config file in /etc/pam.d
1656#
1657# The first argument, 'file' is required. Install as 'new file', if
1658# specified.
1659
1660dopamd() { 1555dopamd() {
1661 local pamd="$1" newpamd="${2:-$1}"
1662 [[ -z "$1" ]] && die "dopamd requires at least one argument." 1556 [[ -z $1 ]] && die "dopamd requires at least one argument"
1663 1557
1664 use pam || return 0 1558 use pam || return 0
1665 1559
1666 insinto /etc/pam.d 1560 INSDESTTREE=/etc/pam.d \
1667 # these are the default doins options, but be explicit just in case 1561 doins "$@" || die "failed to install $@"
1668 insopts -m 0644 -o root -g root
1669 newins ${pamd} ${newpamd} || die "failed to install ${newpamd}"
1670} 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.148  
changed lines
  Added in v.1.200

  ViewVC Help
Powered by ViewVC 1.1.20