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

Diff of /eclass/eutils.eclass

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

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

  ViewVC Help
Powered by ViewVC 1.1.20