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

Diff of /eclass/eutils.eclass

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

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

  ViewVC Help
Powered by ViewVC 1.1.20