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

Diff of /eclass/eutils.eclass

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

Revision 1.148 Revision 1.212
1# Copyright 1999-2004 Gentoo Foundation 1# Copyright 1999-2005 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.148 2005/02/03 23:55:05 azarah Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.212 2005/10/22 02:32:48 vapier Exp $
4# 4#
5# Author: Martin Schlemmer <azarah@gentoo.org> 5# Author: Martin Schlemmer <azarah@gentoo.org>
6# 6#
7# This eclass is for general purpose functions that most ebuilds 7# This eclass is for general purpose functions that most ebuilds
8# have to implement themselves. 8# have to implement themselves.
9# 9#
10# NB: If you add anything, please comment it! 10# NB: If you add anything, please comment it!
11 11
12inherit multilib 12inherit multilib portability
13ECLASS=eutils
14INHERITED="$INHERITED $ECLASS"
15 13
16DEPEND="!bootstrap? ( sys-devel/patch )" 14DEPEND="!bootstrap? ( sys-devel/patch )"
15# sys-apps/shadow is needed for useradd, etc, bug #94745.
17 16
18DESCRIPTION="Based on the ${ECLASS} eclass" 17DESCRIPTION="Based on the ${ECLASS} eclass"
19
20# ecpu_check
21# Usage:
22#
23# ecpu_check array_of_cpu_flags
24#
25# array_of_cpu_flags - An array of cpu flags to check against USE flags
26#
27# Checks user USE related cpu flags against /proc/cpuinfo. If user enables a
28# cpu flag that is not supported in their processor flags, it will warn the
29# user if CROSSCOMPILE is not set to 1 ( because cross compile users are
30# obviously using different cpu flags than their own cpu ). Examples:
31#
32# CPU_FLAGS=(mmx mmx2 sse sse2)
33# ecpu_check CPU_FLAGS
34# Chris White <chriswhite@gentoo.org> (03 Feb 2005)
35
36ecpu_check() {
37 # Think about changing below to: if [ "${CROSSCOMPILE}" -ne 1 -a -e "/proc/cpuinfo" ]
38 # and dropping the else if you do not plan on adding anything to that
39 # empty block ....
40 # PS: also try to add some quoting, and consider rather using ${foo} than $foo ...
41 if [ $CROSSCOMPILE -eq 1 ] || [ ! -e /proc/cpuinfo ]
42 then
43 :
44 else
45 CPU_FLAGS=$1
46 USER_CPU=`grep "flags" /proc/cpuinfo`
47
48 for flags in `seq 1 ${#CPU_FLAGS[@]}`
49 do
50 if has ${CPU_FLAGS[$flags - 1]} $USER_CPU && ! has ${CPU_FLAGS[$flags - 1]} $USE
51 then
52 ewarn "Your system is ${CPU_FLAGS[$flags - 1]} capable but you don't have it enabled!"
53 ewarn "You might be cross compiling (in this case set CROSSCOMPILE to 1 to disable this warning."
54 fi
55
56 if ! has ${CPU_FLAGS[$flags - 1]} $USER_CPU && has ${CPU_FLAGS[$flags -1]} $USE
57 then
58 ewarn "You have ${CPU_FLAGS[$flags - 1]} support enabled but your processor doesn't"
59 ewarn "Seem to support it! You might be cross compiling or do not have /proc filesystem"
60 ewarn "enabled. If either is the case, set CROSSCOMPILE to 1 to disable this warning."
61 fi
62 done
63 fi
64}
65 18
66# Wait for the supplied number of seconds. If no argument is supplied, defaults 19# Wait for the supplied number of seconds. If no argument is supplied, defaults
67# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not 20# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not
68# outputting to a terminal, don't wait. For compatability purposes, the argument 21# outputting to a terminal, don't wait. For compatability purposes, the argument
69# must be an integer greater than zero. 22# must be an integer greater than zero.
111gen_usr_ldscript() { 64gen_usr_ldscript() {
112 local libdir="$(get_libdir)" 65 local libdir="$(get_libdir)"
113 # Just make sure it exists 66 # Just make sure it exists
114 dodir /usr/${libdir} 67 dodir /usr/${libdir}
115 68
69 for lib in "${@}" ; do
116 cat > "${D}/usr/${libdir}/${1}" << END_LDSCRIPT 70 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT
117/* GNU ld script 71 /* GNU ld script
118 Because Gentoo have critical dynamic libraries 72 Since Gentoo has critical dynamic libraries
119 in /lib, and the static versions in /usr/lib, we 73 in /lib, and the static versions in /usr/lib,
120 need to have a "fake" dynamic lib in /usr/lib, 74 we need to have a "fake" dynamic lib in /usr/lib,
121 otherwise we run into linking problems. 75 otherwise we run into linking problems.
122 See bug #4411 on http://bugs.gentoo.org/ for 76
123 more info. */ 77 See bug http://bugs.gentoo.org/4411 for more info.
78 */
124GROUP ( /${libdir}/${1} ) 79 GROUP ( /${libdir}/${lib} )
125END_LDSCRIPT 80 END_LDSCRIPT
126 fperms a+x "/usr/${libdir}/${1}" 81 fperms a+x "/usr/${libdir}/${lib}"
82 done
127} 83}
128 84
129# Simple function to draw a line consisting of '=' the same length as $* 85# Simple function to draw a line consisting of '=' the same length as $*
86# - only to be used by epatch()
130# 87#
131# <azarah@gentoo.org> (11 Nov 2002) 88# <azarah@gentoo.org> (11 Nov 2002)
132# 89#
133draw_line() { 90draw_line() {
134 local i=0 91 local i=0
160EPATCH_SOURCE="${WORKDIR}/patch" 117EPATCH_SOURCE="${WORKDIR}/patch"
161# Default extension for patches 118# Default extension for patches
162EPATCH_SUFFIX="patch.bz2" 119EPATCH_SUFFIX="patch.bz2"
163# Default options for patch 120# Default options for patch
164# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571 121# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571
165EPATCH_OPTS="-g0" 122# Set --no-backup-if-mismatch so we don't leave '.orig' files behind.
123EPATCH_OPTS="-g0 --no-backup-if-mismatch"
166# List of patches not to apply. Not this is only file names, 124# List of patches not to apply. Not this is only file names,
167# and not the full path .. 125# and not the full path ..
168EPATCH_EXCLUDE="" 126EPATCH_EXCLUDE=""
169# Change the printed message for a single patch. 127# Change the printed message for a single patch.
170EPATCH_SINGLE_MSG="" 128EPATCH_SINGLE_MSG=""
129# Change the printed message for multiple patches.
130EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..."
171# Force applying bulk patches even if not following the style: 131# Force applying bulk patches even if not following the style:
172# 132#
173# ??_${ARCH}_foo.${EPATCH_SUFFIX} 133# ??_${ARCH}_foo.${EPATCH_SUFFIX}
174# 134#
175EPATCH_FORCE="no" 135EPATCH_FORCE="no"
206# hand its a directory, it will set EPATCH_SOURCE to this. 166# hand its a directory, it will set EPATCH_SOURCE to this.
207# 167#
208# <azarah@gentoo.org> (10 Nov 2002) 168# <azarah@gentoo.org> (10 Nov 2002)
209# 169#
210epatch() { 170epatch() {
171 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; }
211 local PIPE_CMD="" 172 local PIPE_CMD=""
212 local STDERR_TARGET="${T}/$$.out" 173 local STDERR_TARGET="${T}/$$.out"
213 local PATCH_TARGET="${T}/$$.patch" 174 local PATCH_TARGET="${T}/$$.patch"
214 local PATCH_SUFFIX="" 175 local PATCH_SUFFIX=""
215 local SINGLE_PATCH="no" 176 local SINGLE_PATCH="no"
216 local x="" 177 local x=""
217 178
179 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
180
218 if [ "$#" -gt 1 ] 181 if [ "$#" -gt 1 ]
219 then 182 then
220 local m="" 183 local m=""
221 einfo "${#} patches to apply ..."
222 for m in "$@" ; do 184 for m in "$@" ; do
223 epatch "${m}" 185 epatch "${m}"
224 done 186 done
225 return 0 187 return 0
226 fi 188 fi
280 ;; 242 ;;
281 esac 243 esac
282 244
283 if [ "${SINGLE_PATCH}" = "no" ] 245 if [ "${SINGLE_PATCH}" = "no" ]
284 then 246 then
285 einfo "Applying various patches (bugfixes/updates) ..." 247 einfo "${EPATCH_MULTI_MSG}"
286 fi 248 fi
287 for x in ${EPATCH_SOURCE} 249 for x in ${EPATCH_SOURCE}
288 do 250 do
289 # New ARCH dependant patch naming scheme ... 251 # New ARCH dependant patch naming scheme ...
290 # 252 #
291 # ???_arch_foo.patch 253 # ???_arch_foo.patch
292 # 254 #
293 if [ -f ${x} ] && \ 255 if [ -f ${x} ] && \
294 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "`eval echo \$\{x/_${ARCH}_\}`" != "${x}" ] || \ 256 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "${x/_${ARCH}_}" != "${x}" ] || \
295 [ "${EPATCH_FORCE}" = "yes" ]) 257 [ "${EPATCH_FORCE}" = "yes" ])
296 then 258 then
297 local count=0 259 local count=0
298 local popts="${EPATCH_OPTS}" 260 local popts="${EPATCH_OPTS}"
261 local patchname=${x##*/}
299 262
300 if [ -n "${EPATCH_EXCLUDE}" ] 263 if [ -n "${EPATCH_EXCLUDE}" ]
301 then 264 then
302 if [ "`eval echo \$\{EPATCH_EXCLUDE/${x##*/}\}`" != "${EPATCH_EXCLUDE}" ] 265 if [ "${EPATCH_EXCLUDE/${patchname}}" != "${EPATCH_EXCLUDE}" ]
303 then 266 then
304 continue 267 continue
305 fi 268 fi
306 fi 269 fi
307 270
309 then 272 then
310 if [ -n "${EPATCH_SINGLE_MSG}" ] 273 if [ -n "${EPATCH_SINGLE_MSG}" ]
311 then 274 then
312 einfo "${EPATCH_SINGLE_MSG}" 275 einfo "${EPATCH_SINGLE_MSG}"
313 else 276 else
314 einfo "Applying ${x##*/} ..." 277 einfo "Applying ${patchname} ..."
315 fi 278 fi
316 else 279 else
317 einfo " ${x##*/} ..." 280 einfo " ${patchname} ..."
318 fi 281 fi
319 282
320 echo "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 283 echo "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
321 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 284 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
322 285
323 # Allow for prefix to differ ... im lazy, so shoot me :/ 286 # Allow for prefix to differ ... im lazy, so shoot me :/
324 while [ "${count}" -lt 5 ] 287 while [ "${count}" -lt 5 ]
325 do 288 do
326 # Generate some useful debug info ... 289 # Generate some useful debug info ...
327 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 290 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
328 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 291 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
329 292
330 if [ "${PATCH_SUFFIX}" != "patch" ] 293 if [ "${PATCH_SUFFIX}" != "patch" ]
331 then 294 then
332 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 295 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
333 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 296 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
334 else 297 else
335 PATCH_TARGET="${x}" 298 PATCH_TARGET="${x}"
336 fi 299 fi
337 300
338 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 301 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
339 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 302 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
340 303
341 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 304 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
342 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 305 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
343 306
344 if [ "${PATCH_SUFFIX}" != "patch" ] 307 if [ "${PATCH_SUFFIX}" != "patch" ]
345 then 308 then
346 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1 309 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
347 then 310 then
348 echo 311 echo
349 eerror "Could not extract patch!" 312 eerror "Could not extract patch!"
350 #die "Could not extract patch!" 313 #die "Could not extract patch!"
351 count=5 314 count=5
352 break 315 break
353 fi 316 fi
354 fi 317 fi
355 318
356 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1 319 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f ; _epatch_assert) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
357 then 320 then
358 draw_line "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 321 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
359 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 322 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
360 echo "ACTUALLY APPLYING ${x##*/} ..." >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 323 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
361 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 324 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
362 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 325 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
363 326
364 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 2>&1 327 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
328 _epatch_assert
365 329
366 if [ "$?" -ne 0 ] 330 if [ "$?" -ne 0 ]
367 then 331 then
368 cat ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 332 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
369 echo 333 echo
370 eerror "A dry-run of patch command succeeded, but actually" 334 eerror "A dry-run of patch command succeeded, but actually"
371 eerror "applying the patch failed!" 335 eerror "applying the patch failed!"
372 #die "Real world sux compared to the dreamworld!" 336 #die "Real world sux compared to the dreamworld!"
373 count=5 337 count=5
374 fi 338 fi
375 339
376 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 340 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
377 341
378 break 342 break
379 fi 343 fi
380 344
381 count=$((count + 1)) 345 count=$((count + 1))
387 fi 351 fi
388 352
389 if [ "${count}" -eq 5 ] 353 if [ "${count}" -eq 5 ]
390 then 354 then
391 echo 355 echo
392 eerror "Failed Patch: ${x##*/}!" 356 eerror "Failed Patch: ${patchname} !"
357 eerror " ( ${PATCH_TARGET} )"
393 eerror 358 eerror
394 eerror "Include in your bugreport the contents of:" 359 eerror "Include in your bugreport the contents of:"
395 eerror 360 eerror
396 eerror " ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}" 361 eerror " ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}"
397 echo 362 echo
398 die "Failed Patch: ${x##*/}!" 363 die "Failed Patch: ${patchname}!"
399 fi 364 fi
400 365
401 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 366 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
402 367
403 eend 0 368 eend 0
404 fi 369 fi
405 done 370 done
406 if [ "${SINGLE_PATCH}" = "no" ] 371 if [ "${SINGLE_PATCH}" = "no" ]
407 then 372 then
408 einfo "Done with patching" 373 einfo "Done with patching"
409 fi 374 fi
410} 375}
411 376
412# This function return true if we are using the NPTL pthreads
413# implementation.
414#
415# <azarah@gentoo.org> (06 March 2003)
416#
417have_NPTL() {
418 cat > ${T}/test-nptl.c <<-"END"
419 #define _XOPEN_SOURCE
420 #include <unistd.h>
421 #include <stdio.h>
422
423 int main()
424 {
425 char buf[255];
426 char *str = buf;
427
428 confstr(_CS_GNU_LIBPTHREAD_VERSION, str, 255);
429 if (NULL != str) {
430 printf("%s\n", str);
431 if (NULL != strstr(str, "NPTL"))
432 return 0;
433 }
434
435 return 1;
436 }
437 END
438
439 einfon "Checking for _CS_GNU_LIBPTHREAD_VERSION support in glibc ..."
440 if gcc -o ${T}/nptl ${T}/test-nptl.c &> /dev/null
441 then
442 echo "yes"
443 einfon "Checking what PTHREADS implementation we have ..."
444 if ${T}/nptl
445 then
446 return 0
447 else
448 return 1
449 fi
450 else
451 echo "no"
452 fi
453
454 return 1
455}
456
457# This function check how many cpu's are present, and then set
458# -j in MAKEOPTS accordingly.
459#
460# Thanks to nall <nall@gentoo.org> for this.
461#
462get_number_of_jobs() {
463 local jobs=0
464
465 if [ ! -r /proc/cpuinfo ]
466 then
467 return 1
468 fi
469
470 # This bit is from H?kan Wessberg <nacka-gentoo@refug.org>, bug #13565.
471 if [ "`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | wc -l`" -gt 0 ]
472 then
473 ADMINOPTS="`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | cut -d= -f2 | sed 's/\"//g'`"
474 ADMINPARAM="`echo ${ADMINOPTS} | gawk '{match($0, /-j *[0-9]*/, opt); print opt[0]}'`"
475 ADMINPARAM="${ADMINPARAM/-j}"
476 fi
477
478 export MAKEOPTS="`echo ${MAKEOPTS} | sed -e 's:-j *[0-9]*::g'`"
479
480 if [ "${ARCH}" = "amd64" -o "${ARCH}" = "x86" -o "${ARCH}" = "hppa" -o \
481 "${ARCH}" = "arm" -o "${ARCH}" = "mips" -o "${ARCH}" = "ia64" ]
482 then
483 # these archs will always have "[Pp]rocessor"
484 jobs="$((`grep -c ^[Pp]rocessor /proc/cpuinfo` * 2))"
485
486 elif [ "${ARCH}" = "sparc" -o "${ARCH}" = "sparc64" ]
487 then
488 # sparc always has "ncpus active"
489 jobs="$((`grep "^ncpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
490
491 elif [ "${ARCH}" = "alpha" ]
492 then
493 # alpha has "cpus active", but only when compiled with SMP
494 if [ "`grep -c "^cpus active" /proc/cpuinfo`" -eq 1 ]
495 then
496 jobs="$((`grep "^cpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
497 else
498 jobs=2
499 fi
500
501 elif [ "${ARCH}" = "ppc" -o "${ARCH}" = "ppc64" ]
502 then
503 # ppc has "processor", but only when compiled with SMP
504 if [ "`grep -c "^processor" /proc/cpuinfo`" -eq 1 ]
505 then
506 jobs="$((`grep -c ^processor /proc/cpuinfo` * 2))"
507 else
508 jobs=2
509 fi
510 elif [ "${ARCH}" = "s390" ]
511 then
512 # s390 has "# processors : "
513 jobs="$((`grep "^\# processors" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
514 else
515 jobs="$((`grep -c ^cpu /proc/cpuinfo` * 2))"
516 die "Unknown ARCH -- ${ARCH}!"
517 fi
518
519 # Make sure the number is valid ...
520 if [ "${jobs}" -lt 1 ]
521 then
522 jobs=1
523 fi
524
525 if [ -n "${ADMINPARAM}" ]
526 then
527 if [ "${jobs}" -gt "${ADMINPARAM}" ]
528 then
529 einfo "Setting make jobs to \"-j${ADMINPARAM}\" to ensure successful merge ..."
530 export MAKEOPTS="${MAKEOPTS} -j${ADMINPARAM}"
531 else
532 einfo "Setting make jobs to \"-j${jobs}\" to ensure successful merge ..."
533 export MAKEOPTS="${MAKEOPTS} -j${jobs}"
534 fi
535 fi
536}
537
538# Cheap replacement for when debianutils (and thus mktemp) 377# Cheap replacement for when debianutils (and thus mktemp)
539# does not exist on the users system 378# does not exist on the users system
540# vapier@gentoo.org 379# vapier@gentoo.org
541# 380#
542# Takes just 1 optional parameter (the directory to create tmpfile in) 381# Takes just 1 optional parameter (the directory to create tmpfile in)
543emktemp() { 382emktemp() {
544 local exe="touch" 383 local exe="touch"
545 [ "$1" == "-d" ] && exe="mkdir" && shift 384 [[ $1 == -d ]] && exe="mkdir" && shift
546 local topdir="$1" 385 local topdir=$1
547 386
548 if [ -z "${topdir}" ] 387 if [[ -z ${topdir} ]] ; then
549 then
550 [ -z "${T}" ] \ 388 [[ -z ${T} ]] \
551 && topdir="/tmp" \ 389 && topdir="/tmp" \
552 || topdir="${T}" 390 || topdir=${T}
553 fi 391 fi
554 392
555 if [ -z "$(type -p mktemp)" ] 393 if [[ -z $(type -p mktemp) ]] ; then
556 then
557 local tmp=/ 394 local tmp=/
558 while [ -e "${tmp}" ] ; do 395 while [[ -e ${tmp} ]] ; do
559 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 396 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
560 done 397 done
561 ${exe} "${tmp}" 398 ${exe} "${tmp}" || ${exe} -p "${tmp}"
562 echo "${tmp}" 399 echo "${tmp}"
563 else 400 else
564 [ "${exe}" == "touch" ] \ 401 [[ ${exe} == "touch" ]] \
565 && exe="-p" \ 402 && exe="-p" \
566 || exe="-d" 403 || exe="-d"
567 mktemp ${exe} "${topdir}" 404 mktemp ${exe} "${topdir}"
568 fi 405 fi
569} 406}
573# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 410# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
574# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 411# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
575# 412#
576# egetent(database, key) 413# egetent(database, key)
577egetent() { 414egetent() {
578 if useq ppc-macos ; then 415 case ${CHOST} in
416 *-darwin*)
579 case "$2" in 417 case "$2" in
580 *[!0-9]*) # Non numeric 418 *[!0-9]*) # Non numeric
581 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 419 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
582 ;; 420 ;;
583 *) # Numeric 421 *) # Numeric
584 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 422 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
585 ;; 423 ;;
586 esac 424 esac
587 elif useq x86-fbsd ; then 425 ;;
588 local action 426 *-freebsd*)
589 if [ "$1" == "passwd" ] 427 local opts action="user"
590 then 428 [[ $1 == "passwd" ]] || action="group"
591 action="user" 429
592 else 430 # lookup by uid/gid
593 action="group" 431 if [[ $2 == [[:digit:]]* ]] ; then
432 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
594 fi 433 fi
434
595 pw show "${action}" "$2" -q 435 pw show ${action} ${opts} "$2" -q
596 else 436 ;;
437 *-netbsd*)
438 grep "$2:\*:" /etc/$1
439 ;;
440 *)
597 which nscd >& /dev/null && nscd -i "$1" 441 type -p nscd >& /dev/null && nscd -i "$1"
598 getent "$1" "$2" 442 getent "$1" "$2"
599 fi 443 ;;
444 esac
600} 445}
601 446
602# Simplify/standardize adding users to the system 447# Simplify/standardize adding users to the system
603# vapier@gentoo.org 448# vapier@gentoo.org
604# 449#
612# homedir: /dev/null 457# homedir: /dev/null
613# groups: none 458# groups: none
614# extra: comment of 'added by portage for ${PN}' 459# extra: comment of 'added by portage for ${PN}'
615enewuser() { 460enewuser() {
616 # get the username 461 # get the username
617 local euser="$1"; shift 462 local euser=$1; shift
618 if [ -z "${euser}" ] 463 if [[ -z ${euser} ]] ; then
619 then
620 eerror "No username specified !" 464 eerror "No username specified !"
621 die "Cannot call enewuser without a username" 465 die "Cannot call enewuser without a username"
622 fi 466 fi
623 467
624 # lets see if the username already exists 468 # lets see if the username already exists
625 if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ] 469 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then
626 then
627 return 0 470 return 0
628 fi 471 fi
629 einfo "Adding user '${euser}' to your system ..." 472 einfo "Adding user '${euser}' to your system ..."
630 473
631 # options to pass to useradd 474 # options to pass to useradd
632 local opts= 475 local opts=
633 476
634 # handle uid 477 # handle uid
635 local euid="$1"; shift 478 local euid=$1; shift
636 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] 479 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then
637 then
638 if [ "${euid}" -gt 0 ] 480 if [[ ${euid} -gt 0 ]] ; then
639 then
640 if [ ! -z "`egetent passwd ${euid}`" ] 481 if [[ ! -z $(egetent passwd ${euid}) ]] ; then
641 then
642 euid="next" 482 euid="next"
643 fi 483 fi
644 else 484 else
645 eerror "Userid given but is not greater than 0 !" 485 eerror "Userid given but is not greater than 0 !"
646 die "${euid} is not a valid UID" 486 die "${euid} is not a valid UID"
647 fi 487 fi
648 else 488 else
649 euid="next" 489 euid="next"
650 fi 490 fi
651 if [ "${euid}" == "next" ] 491 if [[ ${euid} == "next" ]] ; then
652 then 492 for euid in $(seq 101 999) ; do
653 local pwrange
654 if [ "${USERLAND}" == "BSD" ] ; then
655 pwrange="`jot 898 101`"
656 else
657 pwrange="`seq 101 999`"
658 fi
659 for euid in ${pwrange} ; do
660 [ -z "`egetent passwd ${euid}`" ] && break 493 [[ -z $(egetent passwd ${euid}) ]] && break
661 done 494 done
662 fi 495 fi
663 opts="${opts} -u ${euid}" 496 opts="${opts} -u ${euid}"
664 einfo " - Userid: ${euid}" 497 einfo " - Userid: ${euid}"
665 498
666 # handle shell 499 # handle shell
667 local eshell="$1"; shift 500 local eshell=$1; shift
668 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ] 501 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
669 then
670 if [ ! -e "${eshell}" ] 502 if [[ ! -e ${eshell} ]] ; then
671 then
672 eerror "A shell was specified but it does not exist !" 503 eerror "A shell was specified but it does not exist !"
673 die "${eshell} does not exist" 504 die "${eshell} does not exist"
674 fi 505 fi
675 else 506 else
676 if [ "${USERLAND}" == "BSD" ] 507 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
677 then 508 [[ -x ${ROOT}${shell} ]] && break
678 eshell="/usr/bin/false" 509 done
679 else 510
680 eshell="/bin/false" 511 if [[ ${shell} == "/dev/null" ]] ; then
512 eerror "Unable to identify the shell to use"
513 die "Unable to identify the shell to use"
681 fi 514 fi
515
516 eshell=${shell}
682 fi 517 fi
683 einfo " - Shell: ${eshell}" 518 einfo " - Shell: ${eshell}"
684 opts="${opts} -s ${eshell}" 519 opts="${opts} -s ${eshell}"
685 520
686 # handle homedir 521 # handle homedir
687 local ehome="$1"; shift 522 local ehome=$1; shift
688 if [ -z "${ehome}" ] && [ "${eshell}" != "-1" ] 523 if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then
689 then
690 ehome="/dev/null" 524 ehome="/dev/null"
691 fi 525 fi
692 einfo " - Home: ${ehome}" 526 einfo " - Home: ${ehome}"
693 opts="${opts} -d ${ehome}" 527 opts="${opts} -d ${ehome}"
694 528
695 # handle groups 529 # handle groups
696 local egroups="$1"; shift 530 local egroups=$1; shift
697 if [ ! -z "${egroups}" ] 531 if [[ ! -z ${egroups} ]] ; then
698 then
699 local oldifs="${IFS}" 532 local oldifs=${IFS}
700 local defgroup="" exgroups="" 533 local defgroup="" exgroups=""
701 534
702 export IFS="," 535 export IFS=","
703 for g in ${egroups} 536 for g in ${egroups} ; do
704 do
705 export IFS="${oldifs}" 537 export IFS=${oldifs}
706 if [ -z "`egetent group \"${g}\"`" ] 538 if [[ -z $(egetent group "${g}") ]] ; then
707 then
708 eerror "You must add group ${g} to the system first" 539 eerror "You must add group ${g} to the system first"
709 die "${g} is not a valid GID" 540 die "${g} is not a valid GID"
710 fi 541 fi
711 if [ -z "${defgroup}" ] 542 if [[ -z ${defgroup} ]] ; then
712 then
713 defgroup="${g}" 543 defgroup=${g}
714 else 544 else
715 exgroups="${exgroups},${g}" 545 exgroups="${exgroups},${g}"
716 fi 546 fi
717 export IFS="," 547 export IFS=","
718 done 548 done
719 export IFS="${oldifs}" 549 export IFS=${oldifs}
720 550
721 opts="${opts} -g ${defgroup}" 551 opts="${opts} -g ${defgroup}"
722 if [ ! -z "${exgroups}" ] 552 if [[ ! -z ${exgroups} ]] ; then
723 then
724 opts="${opts} -G ${exgroups:1}" 553 opts="${opts} -G ${exgroups:1}"
725 fi 554 fi
726 else 555 else
727 egroups="(none)" 556 egroups="(none)"
728 fi 557 fi
729 einfo " - Groups: ${egroups}" 558 einfo " - Groups: ${egroups}"
730 559
731 # handle extra and add the user 560 # handle extra and add the user
732 local eextra="$@"
733 local oldsandbox="${SANDBOX_ON}" 561 local oldsandbox=${SANDBOX_ON}
734 export SANDBOX_ON="0" 562 export SANDBOX_ON="0"
735 if useq ppc-macos 563 case ${CHOST} in
736 then 564 *-darwin*)
737 ### Make the user 565 ### Make the user
738 if [ -z "${eextra}" ] 566 if [[ -z $@ ]] ; then
739 then
740 dscl . create /users/${euser} uid ${euid} 567 dscl . create /users/${euser} uid ${euid}
741 dscl . create /users/${euser} shell ${eshell} 568 dscl . create /users/${euser} shell ${eshell}
742 dscl . create /users/${euser} home ${ehome} 569 dscl . create /users/${euser} home ${ehome}
743 dscl . create /users/${euser} realname "added by portage for ${PN}" 570 dscl . create /users/${euser} realname "added by portage for ${PN}"
744 ### Add the user to the groups specified 571 ### Add the user to the groups specified
745 local oldifs="${IFS}" 572 local oldifs=${IFS}
746 export IFS="," 573 export IFS=","
747 for g in ${egroups} 574 for g in ${egroups} ; do
748 do
749 dscl . merge /groups/${g} users ${euser} 575 dscl . merge /groups/${g} users ${euser}
750 done 576 done
751 export IFS="${oldifs}" 577 export IFS=${oldifs}
752 else 578 else
753 einfo "Extra options are not supported on macos yet" 579 einfo "Extra options are not supported on Darwin yet"
754 einfo "Please report the ebuild along with the info below" 580 einfo "Please report the ebuild along with the info below"
755 einfo "eextra: ${eextra}" 581 einfo "eextra: $@"
756 die "Required function missing" 582 die "Required function missing"
757 fi 583 fi
758 elif use x86-fbsd ; then 584 ;;
759 if [ -z "${eextra}" ] 585 *-freebsd*)
760 then 586 if [[ -z $@ ]] ; then
761 pw useradd ${euser} ${opts} \ 587 pw useradd ${euser} ${opts} \
762 -c "added by portage for ${PN}" \ 588 -c "added by portage for ${PN}" \
763 die "enewuser failed" 589 die "enewuser failed"
764 else 590 else
765 einfo " - Extra: ${eextra}" 591 einfo " - Extra: $@"
766 pw useradd ${euser} ${opts} \ 592 pw useradd ${euser} ${opts} \
767 -c ${eextra} || die "enewuser failed" 593 "$@" || die "enewuser failed"
768 fi 594 fi
595 ;;
596
597 *-netbsd*)
598 if [[ -z $@ ]] ; then
599 useradd ${opts} ${euser} || die "enewuser failed"
769 else 600 else
770 if [ -z "${eextra}" ] 601 einfo " - Extra: $@"
771 then 602 useradd ${opts} ${euser} "$@" || die "enewuser failed"
603 fi
604 ;;
605 *)
606 if [[ -z $@ ]] ; then
772 useradd ${opts} ${euser} \ 607 useradd ${opts} ${euser} \
773 -c "added by portage for ${PN}" \ 608 -c "added by portage for ${PN}" \
774 || die "enewuser failed" 609 || die "enewuser failed"
775 else 610 else
776 einfo " - Extra: ${eextra}" 611 einfo " - Extra: $@"
777 useradd ${opts} ${euser} ${eextra} \ 612 useradd ${opts} ${euser} "$@" \
778 || die "enewuser failed" 613 || die "enewuser failed"
779 fi 614 fi
615 ;;
616 esac
617
618 if [[ ! -e ${ROOT}/${ehome} ]] ; then
619 einfo " - Creating ${ehome} in ${ROOT}"
620 mkdir -p "${ROOT}/${ehome}"
621 chown ${euser} "${ROOT}/${ehome}"
622 chmod 755 "${ROOT}/${ehome}"
780 fi 623 fi
624
781 export SANDBOX_ON="${oldsandbox}" 625 export SANDBOX_ON=${oldsandbox}
782
783 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ]
784 then
785 einfo " - Creating ${ehome} in ${D}"
786 dodir ${ehome}
787 fowners ${euser} ${ehome}
788 fperms 755 ${ehome}
789 fi
790} 626}
791 627
792# Simplify/standardize adding groups to the system 628# Simplify/standardize adding groups to the system
793# vapier@gentoo.org 629# vapier@gentoo.org
794# 630#
823 then 659 then
824 if [ "${egid}" -gt 0 ] 660 if [ "${egid}" -gt 0 ]
825 then 661 then
826 if [ -z "`egetent group ${egid}`" ] 662 if [ -z "`egetent group ${egid}`" ]
827 then 663 then
828 if useq ppc-macos ; then 664 if [[ "${CHOST}" == *-darwin* ]]; then
829 opts="${opts} ${egid}" 665 opts="${opts} ${egid}"
830 else 666 else
831 opts="${opts} -g ${egid}" 667 opts="${opts} -g ${egid}"
832 fi 668 fi
833 else 669 else
847 opts="${opts} ${eextra}" 683 opts="${opts} ${eextra}"
848 684
849 # add the group 685 # add the group
850 local oldsandbox="${SANDBOX_ON}" 686 local oldsandbox="${SANDBOX_ON}"
851 export SANDBOX_ON="0" 687 export SANDBOX_ON="0"
852 if useq ppc-macos ; then 688 case ${CHOST} in
689 *-darwin*)
853 if [ ! -z "${eextra}" ]; 690 if [ ! -z "${eextra}" ];
854 then 691 then
855 einfo "Extra options are not supported on macos yet" 692 einfo "Extra options are not supported on Darwin/OS X yet"
856 einfo "Please report the ebuild along with the info below" 693 einfo "Please report the ebuild along with the info below"
857 einfo "eextra: ${eextra}" 694 einfo "eextra: ${eextra}"
858 die "Required function missing" 695 die "Required function missing"
859 fi 696 fi
860 697
861 # If we need the next available 698 # If we need the next available
862 case ${egid} in 699 case ${egid} in
863 *[!0-9]*) # Non numeric 700 *[!0-9]*) # Non numeric
864 for egid in `jot 898 101`; do 701 for egid in $(seq 101 999); do
865 [ -z "`egetent group ${egid}`" ] && break 702 [ -z "`egetent group ${egid}`" ] && break
866 done 703 done
867 esac 704 esac
868 dscl . create /groups/${egroup} gid ${egid} 705 dscl . create /groups/${egroup} gid ${egid}
869 dscl . create /groups/${egroup} passwd '*' 706 dscl . create /groups/${egroup} passwd '*'
870 elif use x86-fbsd ; then 707 ;;
708
709 *-freebsd*)
871 case ${egid} in 710 case ${egid} in
872 *[!0-9]*) # Non numeric 711 *[!0-9]*) # Non numeric
873 for egid in `jot 898 101`; do 712 for egid in $(seq 101 999); do
874 [ -z "`egetent group ${egid}`" ] && break 713 [ -z "`egetent group ${egid}`" ] && break
875 done 714 done
876 esac 715 esac
877 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 716 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
878 else 717 ;;
718
719 *-netbsd*)
720 case ${egid} in
721 *[!0-9]*) # Non numeric
722 for egid in $(seq 101 999); do
723 [ -z "`egetent group ${egid}`" ] && break
724 done
725 esac
726 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
727 ;;
728
729 *)
879 groupadd ${opts} ${egroup} || die "enewgroup failed" 730 groupadd ${opts} ${egroup} || die "enewgroup failed"
880 fi 731 ;;
732 esac
881 export SANDBOX_ON="${oldsandbox}" 733 export SANDBOX_ON="${oldsandbox}"
882} 734}
883 735
884# Simple script to replace 'dos2unix' binaries 736# Simple script to replace 'dos2unix' binaries
885# vapier@gentoo.org 737# vapier@gentoo.org
910# name: the name that will show up in the menu 762# name: the name that will show up in the menu
911# icon: give your little like a pretty little icon ... 763# icon: give your little like a pretty little icon ...
912# this can be relative (to /usr/share/pixmaps) or 764# this can be relative (to /usr/share/pixmaps) or
913# a full path to an icon 765# a full path to an icon
914# type: what kind of application is this ? for categories: 766# type: what kind of application is this ? for categories:
915# http://www.freedesktop.org/standards/menu-spec/ 767# http://www.freedesktop.org/Standards/desktop-entry-spec
916# path: if your app needs to startup in a specific dir 768# path: if your app needs to startup in a specific dir
917make_desktop_entry() { 769make_desktop_entry() {
918 [ -z "$1" ] && eerror "make_desktop_entry: You must specify the executable" && return 1 770 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
919 771
920 local exec="${1}" 772 local exec=${1}
921 local name="${2:-${PN}}" 773 local name=${2:-${PN}}
922 local icon="${3:-${PN}.png}" 774 local icon=${3:-${PN}.png}
923 local type="${4}" 775 local type=${4}
924 local subdir="${6}" 776 local path=${5}
925 local path="${5:-${GAMES_BINDIR}}" 777
926 if [ -z "${type}" ] 778 if [[ -z ${type} ]] ; then
927 then 779 local catmaj=${CATEGORY%%-*}
928 case ${CATEGORY} in 780 local catmin=${CATEGORY##*-}
929 "app-emulation") 781 case ${catmaj} in
930 type=Emulator 782 app)
931 subdir="Emulation" 783 case ${catmin} in
784 admin) type=System;;
785 cdr) type=DiscBurning;;
786 dicts) type=Dictionary;;
787 editors) type=TextEditor;;
788 emacs) type=TextEditor;;
789 emulation) type=Emulator;;
790 laptop) type=HardwareSettings;;
791 office) type=Office;;
792 vim) type=TextEditor;;
793 xemacs) type=TextEditor;;
794 *) type=;;
795 esac
932 ;; 796 ;;
933 "games-"*) 797
934 type=Game 798 dev)
935 subdir="Games" 799 type="Development"
936 ;; 800 ;;
937 "net-"*) 801
938 type=Network 802 games)
939 subdir="${type}" 803 case ${catmin} in
804 action) type=ActionGame;;
805 arcade) type=ArcadeGame;;
806 board) type=BoardGame;;
807 kid) type=KidsGame;;
808 emulation) type=Emulator;;
809 puzzle) type=LogicGame;;
810 rpg) type=RolePlaying;;
811 roguelike) type=RolePlaying;;
812 simulation) type=Simulation;;
813 sports) type=SportsGame;;
814 strategy) type=StrategyGame;;
815 *) type=;;
816 esac
817 type="Game;${type}"
940 ;; 818 ;;
819
820 mail)
821 type="Network;Email"
822 ;;
823
824 media)
825 case ${catmin} in
826 gfx) type=Graphics;;
827 radio) type=Tuner;;
828 sound) type=Audio;;
829 tv) type=TV;;
830 video) type=Video;;
831 *) type=;;
832 esac
833 type="AudioVideo;${type}"
834 ;;
835
836 net)
837 case ${catmin} in
838 dialup) type=Dialup;;
839 ftp) type=FileTransfer;;
840 im) type=InstantMessaging;;
841 irc) type=IRCClient;;
842 mail) type=Email;;
843 news) type=News;;
844 nntp) type=News;;
845 p2p) type=FileTransfer;;
846 *) type=;;
847 esac
848 type="Network;${type}"
849 ;;
850
851 sci)
852 case ${catmin} in
853 astro*) type=Astronomoy;;
854 bio*) type=Biology;;
855 calc*) type=Calculator;;
856 chem*) type=Chemistry;;
857 geo*) type=Geology;;
858 math*) type=Math;;
859 *) type=;;
860 esac
861 type="Science;${type}"
862 ;;
863
864 www)
865 case ${catmin} in
866 client) type=WebBrowser;;
867 *) type=;;
868 esac
869 type="Network"
870 ;;
871
941 *) 872 *)
942 type= 873 type=
943 subdir=
944 ;; 874 ;;
945 esac 875 esac
946 fi 876 fi
877 if [ "${SLOT}" == "0" ] ; then
878 local desktop_name="${PN}"
879 else
880 local desktop_name="${PN}-${SLOT}"
881 fi
947 local desktop="${T}/${exec}.desktop" 882 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
948 883
949echo "[Desktop Entry] 884echo "[Desktop Entry]
950Encoding=UTF-8 885Encoding=UTF-8
951Version=0.9.2 886Version=0.9.2
952Name=${name} 887Name=${name}
955Exec=${exec} 890Exec=${exec}
956Path=${path} 891Path=${path}
957Icon=${icon} 892Icon=${icon}
958Categories=Application;${type};" > "${desktop}" 893Categories=Application;${type};" > "${desktop}"
959 894
895 (
896 # wrap the env here so that the 'insinto' call
897 # doesn't corrupt the env of the caller
960 insinto /usr/share/applications 898 insinto /usr/share/applications
961 doins "${desktop}" 899 doins "${desktop}"
962 900 )
963 return 0
964} 901}
965 902
966# Make a GDM/KDM Session file 903# Make a GDM/KDM Session file
967# 904#
968# make_desktop_entry(<title>, <command>) 905# make_desktop_entry(<title>, <command>)
969# title: File to execute to start the Window Manager 906# title: File to execute to start the Window Manager
970# command: Name of the Window Manager 907# command: Name of the Window Manager
971 908
972make_session_desktop() { 909make_session_desktop() {
973
974 [ -z "$1" ] && eerror "make_session_desktop: You must specify the title" && return 1 910 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1
975 [ -z "$2" ] && eerror "make_session_desktop: You must specify the command" && return 1 911 [[ -z $2 ]] && eerror "make_session_desktop: You must specify the command" && return 1
976 912
977 local title="${1}" 913 local title=$1
978 local command="${2}" 914 local command=$2
979 local desktop="${T}/${wm}.desktop" 915 local desktop=${T}/${wm}.desktop
980 916
981echo "[Desktop Entry] 917echo "[Desktop Entry]
982Encoding=UTF-8 918Encoding=UTF-8
983Name=${title} 919Name=${title}
984Comment=This session logs you into ${title} 920Comment=This session logs you into ${title}
986TryExec=${command} 922TryExec=${command}
987Type=Application" > "${desktop}" 923Type=Application" > "${desktop}"
988 924
989 insinto /usr/share/xsessions 925 insinto /usr/share/xsessions
990 doins "${desktop}" 926 doins "${desktop}"
991
992 return 0
993} 927}
994 928
995domenu() { 929domenu() {
996 local i 930 local i j
997 local j
998 insinto /usr/share/applications 931 insinto /usr/share/applications
999 for i in ${@} 932 for i in "$@" ; do
1000 do
1001 if [ -f "${i}" ]; 933 if [[ -f ${i} ]] ; then
1002 then
1003 doins ${i} 934 doins "${i}"
1004 elif [ -d "${i}" ]; 935 elif [[ -d ${i} ]] ; then
1005 then
1006 for j in ${i}/*.desktop 936 for j in "${i}"/*.desktop ; do
1007 do
1008 doins ${j} 937 doins "${j}"
1009 done 938 done
1010 fi 939 fi
1011 done 940 done
1012} 941}
942newmenu() {
943 insinto /usr/share/applications
944 newins "$1" "$2"
945}
1013 946
1014doicon() { 947doicon() {
1015 local i 948 local i j
1016 local j
1017 insinto /usr/share/pixmaps 949 insinto /usr/share/pixmaps
1018 for i in ${@} 950 for i in "$@" ; do
1019 do
1020 if [ -f "${i}" ]; 951 if [[ -f ${i} ]] ; then
1021 then
1022 doins ${i} 952 doins "${i}"
1023 elif [ -d "${i}" ]; 953 elif [[ -d ${i} ]] ; then
1024 then
1025 for j in ${i}/*.png 954 for j in "${i}"/*.png ; do
1026 do
1027 doins ${j} 955 doins "${j}"
1028 done 956 done
1029 fi 957 fi
1030 done 958 done
959}
960newicon() {
961 insinto /usr/share/pixmaps
962 newins "$1" "$2"
1031} 963}
1032 964
1033############################################################## 965##############################################################
1034# END: Handle .desktop files and menu entries # 966# END: Handle .desktop files and menu entries #
1035############################################################## 967##############################################################
1036 968
1037 969
1038# for internal use only (unpack_pdv and unpack_makeself) 970# for internal use only (unpack_pdv and unpack_makeself)
1039find_unpackable_file() { 971find_unpackable_file() {
1040 local src="$1" 972 local src=$1
1041 if [ -z "${src}" ] 973 if [[ -z ${src} ]] ; then
1042 then
1043 src="${DISTDIR}/${A}" 974 src=${DISTDIR}/${A}
1044 else 975 else
1045 if [ -e "${DISTDIR}/${src}" ] 976 if [[ -e ${DISTDIR}/${src} ]] ; then
1046 then
1047 src="${DISTDIR}/${src}" 977 src=${DISTDIR}/${src}
1048 elif [ -e "${PWD}/${src}" ] 978 elif [[ -e ${PWD}/${src} ]] ; then
1049 then
1050 src="${PWD}/${src}" 979 src=${PWD}/${src}
1051 elif [ -e "${src}" ] 980 elif [[ -e ${src} ]] ; then
1052 then
1053 src="${src}" 981 src=${src}
1054 fi
1055 fi 982 fi
1056 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 983 fi
984 [[ ! -e ${src} ]] && return 1
1057 echo "${src}" 985 echo "${src}"
1058} 986}
1059 987
1060# Unpack those pesky pdv generated files ... 988# Unpack those pesky pdv generated files ...
1061# They're self-unpacking programs with the binary package stuffed in 989# They're self-unpacking programs with the binary package stuffed in
1076# lseek 1004# lseek
1077# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1005# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
1078# lseek(3, -4, SEEK_END) = 2981250 1006# lseek(3, -4, SEEK_END) = 2981250
1079# thus we would pass in the value of '4' as the second parameter. 1007# thus we would pass in the value of '4' as the second parameter.
1080unpack_pdv() { 1008unpack_pdv() {
1081 local src="`find_unpackable_file $1`" 1009 local src=$(find_unpackable_file $1)
1082 local sizeoff_t="$2" 1010 local sizeoff_t=$2
1083 1011
1012 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1084 [ -z "${sizeoff_t}" ] && die "No idea what off_t size was used for this pdv :(" 1013 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
1085 1014
1086 local shrtsrc="`basename ${src}`" 1015 local shrtsrc=$(basename "${src}")
1087 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1016 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1088 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1017 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
1089 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"` 1018 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
1090 1019
1091 # grab metadata for debug reasons 1020 # grab metadata for debug reasons
1155# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1084# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1156# - If the file is not specified then unpack will utilize ${A}. 1085# - If the file is not specified then unpack will utilize ${A}.
1157# - If the offset is not specified then we will attempt to extract 1086# - If the offset is not specified then we will attempt to extract
1158# the proper offset from the script itself. 1087# the proper offset from the script itself.
1159unpack_makeself() { 1088unpack_makeself() {
1160 local src="$(find_unpackable_file "$1")" 1089 local src=$(find_unpackable_file "$1")
1161 local skip="$2" 1090 local skip=$2
1162 local exe="$3" 1091 local exe=$3
1163 1092
1093 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1094
1164 local shrtsrc="$(basename "${src}")" 1095 local shrtsrc=$(basename "${src}")
1165 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1096 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1166 if [ -z "${skip}" ] 1097 if [[ -z ${skip} ]] ; then
1167 then
1168 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1098 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1169 local skip=0 1099 local skip=0
1170 exe=tail 1100 exe=tail
1171 case ${ver} in 1101 case ${ver} in
1172 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1102 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
1173 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1103 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1185 ;; 1115 ;;
1186 2.1.3) 1116 2.1.3)
1187 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1117 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1188 let skip="skip + 1" 1118 let skip="skip + 1"
1189 ;; 1119 ;;
1190 2.1.4) 1120 2.1.4|2.1.5)
1191 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1) 1121 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
1192 skip=$(head -n ${skip} "${src}" | wc -c) 1122 skip=$(head -n ${skip} "${src}" | wc -c)
1193 exe="dd" 1123 exe="dd"
1194 ;; 1124 ;;
1195 *) 1125 *)
1240check_license() { 1170check_license() {
1241 local lic=$1 1171 local lic=$1
1242 if [ -z "${lic}" ] ; then 1172 if [ -z "${lic}" ] ; then
1243 lic="${PORTDIR}/licenses/${LICENSE}" 1173 lic="${PORTDIR}/licenses/${LICENSE}"
1244 else 1174 else
1245 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1175 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1246 lic="${PORTDIR}/licenses/${src}" 1176 lic="${PORTDIR}/licenses/${lic}"
1247 elif [ -e "${PWD}/${src}" ] ; then 1177 elif [ -e "${PWD}/${lic}" ] ; then
1248 lic="${PWD}/${src}" 1178 lic="${PWD}/${lic}"
1249 elif [ -e "${src}" ] ; then 1179 elif [ -e "${lic}" ] ; then
1250 lic="${src}" 1180 lic="${lic}"
1251 fi
1252 fi 1181 fi
1182 fi
1253 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1183 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1254 local l="`basename ${lic}`" 1184 local l="`basename ${lic}`"
1255 1185
1256 # here is where we check for the licenses the user already 1186 # here is where we check for the licenses the user already
1257 # accepted ... if we don't find a match, we make the user accept 1187 # accepted ... if we don't find a match, we make the user accept
1258 local shopts=$- 1188 local shopts=$-
1429# displayed and we'll hang out here until: 1359# displayed and we'll hang out here until:
1430# (1) the file is found on a mounted cdrom 1360# (1) the file is found on a mounted cdrom
1431# (2) the user hits CTRL+C 1361# (2) the user hits CTRL+C
1432cdrom_locate_file_on_cd() { 1362cdrom_locate_file_on_cd() {
1433 while [[ -z ${CDROM_ROOT} ]] ; do 1363 while [[ -z ${CDROM_ROOT} ]] ; do
1434 local dir="$(dirname ${@})" 1364 local dir=$(dirname "$*")
1435 local file="$(basename ${@})" 1365 local file=$(basename "$*")
1436 local mline="" 1366 local mline=""
1437 local showedmsg=0 1367 local showedmsg=0
1438 1368
1439 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1369 for mline in $(mount | egrep -e '(iso|cdrom|fs=cdfss)' | awk '{print $3}') ; do
1440 [[ -d ${mline}/${dir} ]] || continue 1370 [[ -d ${mline}/${dir} ]] || continue
1441 [[ ! -z $(find ${mline}/${dir} -iname ${file} -maxdepth 1) ]] \ 1371 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \
1442 && export CDROM_ROOT=${mline} 1372 && export CDROM_ROOT=${mline}
1443 done 1373 done
1444 1374
1445 if [[ -z ${CDROM_ROOT} ]] ; then 1375 if [[ -z ${CDROM_ROOT} ]] ; then
1446 echo 1376 echo
1461 fi 1391 fi
1462 showedmsg=1 1392 showedmsg=1
1463 fi 1393 fi
1464 einfo "Press return to scan for the cd again" 1394 einfo "Press return to scan for the cd again"
1465 einfo "or hit CTRL+C to abort the emerge." 1395 einfo "or hit CTRL+C to abort the emerge."
1396 echo
1397 einfo "If you are having trouble with the detection"
1398 einfo "of your CD, it is possible that you do not have"
1399 einfo "Joliet support enabled in your kernel. Please"
1400 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1466 read 1401 read
1467 fi 1402 fi
1468 done 1403 done
1469} 1404}
1470 1405
1480# directories and uses the intersection of the lists. 1415# directories and uses the intersection of the lists.
1481# The -u builds a list of po files found in all the 1416# The -u builds a list of po files found in all the
1482# directories and uses the union of the lists. 1417# directories and uses the union of the lists.
1483strip-linguas() { 1418strip-linguas() {
1484 local ls newls 1419 local ls newls
1485 if [ "$1" == "-i" ] || [ "$1" == "-u" ] ; then 1420 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1486 local op="$1"; shift 1421 local op=$1; shift
1487 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1422 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift
1488 local d f 1423 local d f
1489 for d in "$@" ; do 1424 for d in "$@" ; do
1490 if [ "${op}" == "-u" ] ; then 1425 if [[ ${op} == "-u" ]] ; then
1491 newls="${ls}" 1426 newls=${ls}
1492 else 1427 else
1493 newls="" 1428 newls=""
1494 fi 1429 fi
1495 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1430 for f in $(find "$d" -name '*.po' -printf '%f ') ; do
1496 if [ "${op}" == "-i" ] ; then 1431 if [[ ${op} == "-i" ]] ; then
1497 [ "${ls/ ${f} /}" != "${ls}" ] && newls="${newls} ${f}" 1432 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}"
1498 else 1433 else
1499 [ "${ls/ ${f} /}" == "${ls}" ] && newls="${newls} ${f}" 1434 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}"
1500 fi 1435 fi
1501 done 1436 done
1502 ls="${newls}" 1437 ls=${newls}
1503 done 1438 done
1504 ls="${ls//.po}" 1439 ls=${ls//.po}
1505 else 1440 else
1506 ls="$@" 1441 ls=$@
1507 fi 1442 fi
1508 1443
1509 ls=" ${ls} " 1444 ls=" ${ls} "
1510 newls="" 1445 newls=""
1511 for f in ${LINGUAS} ; do 1446 for f in ${LINGUAS} ; do
1512 if [ "${ls/ ${f} /}" != "${ls}" ] ; then 1447 if [[ ${ls/ ${f} /} != ${ls} ]] ; then
1513 newls="${newls} ${f}" 1448 newls="${newls} ${f}"
1514 else 1449 else
1515 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1450 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA"
1516 fi 1451 fi
1517 done 1452 done
1518 if [ -z "${newls}" ] ; then 1453 if [[ -z ${newls} ]] ; then
1519 unset LINGUAS 1454 export LINGUAS=""
1520 else 1455 else
1521 export LINGUAS="${newls}" 1456 export LINGUAS=${newls:1}
1522 fi 1457 fi
1523} 1458}
1524 1459
1525# moved from kernel.eclass since they are generally useful outside of 1460# moved from kernel.eclass since they are generally useful outside of
1526# kernel.eclass -iggy (20041002) 1461# kernel.eclass -iggy (20041002)
1534 while ((i--)) ; do 1469 while ((i--)) ; do
1535 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass" 1470 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1536 done 1471 done
1537 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1472 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1538 case ${ARCH} in 1473 case ${ARCH} in
1539 x86) export ARCH="i386";; 1474 x86) export ARCH="i386";;
1540 amd64) export ARCH="x86_64";; 1475 amd64) export ARCH="x86_64";;
1541 hppa) export ARCH="parisc";; 1476 hppa) export ARCH="parisc";;
1542 mips) export ARCH="mips";; 1477 mips) export ARCH="mips";;
1543 sparc) export ARCH="$(tc-arch-kernel)";; # Yeah this is ugly, but it's even WORSE if you don't do this. linux-info.eclass's set_arch_to_kernel is fixed, but won't get used over this one! 1478 sparc) export ARCH="$(tc-arch-kernel)";; # Yeah this is ugly, but it's even WORSE if you don't do this. linux-info.eclass's set_arch_to_kernel is fixed, but won't get used over this one!
1544 *) export ARCH="${ARCH}";; 1479 *) export ARCH="${ARCH}";;
1545 esac 1480 esac
1546} 1481}
1547 1482
1548# set's ARCH back to what portage expects 1483# set's ARCH back to what portage expects
1549set_arch_to_portage() { 1484set_arch_to_portage() {
1593 LIB=$1 1528 LIB=$1
1594 1529
1595 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1530 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1596 SONAME=`basename ${LIB}` 1531 SONAME=`basename ${LIB}`
1597 1532
1598 einfo "An old version of an installed library was detected on your system." 1533 ewarn "An old version of an installed library was detected on your system."
1599 einfo "In order to avoid breaking packages that link against is, this older version" 1534 ewarn "In order to avoid breaking packages that link against it, this older version"
1600 einfo "is not being removed. In order to make full use of this newer version," 1535 ewarn "is not being removed. In order to make full use of this newer version,"
1601 einfo "you will need to execute the following command:" 1536 ewarn "you will need to execute the following command:"
1602 einfo " revdep-rebuild --soname ${SONAME}" 1537 ewarn " revdep-rebuild --soname ${SONAME}"
1603 einfo 1538 ewarn
1604 einfo "After doing that, you can safely remove ${LIB}" 1539 ewarn "After doing that, you can safely remove ${LIB}"
1605 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1540 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1606 fi 1541 fi
1607} 1542}
1608 1543
1609# Hack for people to figure out if a package was built with 1544# Hack for people to figure out if a package was built with
1610# certain USE flags 1545# certain USE flags
1648 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null 1583 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
1649 done 1584 done
1650 eend 0 1585 eend 0
1651} 1586}
1652 1587
1653# dopamd [ file ] [ new file ] 1588# dopamd <file> [more files]
1654# 1589#
1655# Install pam auth config file in /etc/pam.d 1590# Install pam auth config file in /etc/pam.d
1656#
1657# The first argument, 'file' is required. Install as 'new file', if
1658# specified.
1659
1660dopamd() { 1591dopamd() {
1661 local pamd="$1" newpamd="${2:-$1}"
1662 [[ -z "$1" ]] && die "dopamd requires at least one argument." 1592 [[ -z $1 ]] && die "dopamd requires at least one argument"
1663 1593
1664 use pam || return 0 1594 use pam || return 0
1665 1595
1666 insinto /etc/pam.d 1596 INSDESTTREE=/etc/pam.d \
1667 # these are the default doins options, but be explicit just in case 1597 doins "$@" || die "failed to install $@"
1668 insopts -m 0644 -o root -g root
1669 newins ${pamd} ${newpamd} || die "failed to install ${newpamd}"
1670} 1598}
1599# newpamd <old name> <new name>
1600#
1601# Install pam file <old name> as <new name> in /etc/pam.d
1602newpamd() {
1603 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1604
1605 use pam || return 0
1606
1607 INSDESTTREE=/etc/pam.d \
1608 newins "$1" "$2" || die "failed to install $1 as $2"
1609}
1610
1611# make a wrapper script ...
1612# NOTE: this was originally games_make_wrapper, but I noticed other places where
1613# this could be used, so I have moved it here and made it not games-specific
1614# -- wolf31o2
1615# $1 == wrapper name
1616# $2 == binary to run
1617# $3 == directory to chdir before running binary
1618# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1619# $5 == path for wrapper
1620make_wrapper() {
1621 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1622 local tmpwrapper=$(emktemp)
1623 # We don't want to quote ${bin} so that people can pass complex
1624 # things as $bin ... "./someprog --args"
1625 cat << EOF > "${tmpwrapper}"
1626#!/bin/sh
1627cd "${chdir:-.}"
1628if [ -n "${libdir}" ] ; then
1629 if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
1630 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1631 else
1632 export LD_LIBRARY_PATH="${libdir}"
1633 fi
1634fi
1635exec ${bin} "\$@"
1636EOF
1637 chmod go+rx "${tmpwrapper}"
1638 if [[ -n ${path} ]] ; then
1639 exeinto "${path}"
1640 newexe "${tmpwrapper}" "${wrapper}"
1641 else
1642 newbin "${tmpwrapper}" "${wrapper}"
1643 fi
1644}

Legend:
Removed from v.1.148  
changed lines
  Added in v.1.212

  ViewVC Help
Powered by ViewVC 1.1.20