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

Diff of /eclass/eutils.eclass

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

Revision 1.158 Revision 1.247
1# Copyright 1999-2005 Gentoo Foundation 1# Copyright 1999-2006 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.158 2005/03/17 02:45:10 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.247 2006/08/11 02:21:47 vapier Exp $
4#
5# Author: Martin Schlemmer <azarah@gentoo.org>
6# 4#
7# This eclass is for general purpose functions that most ebuilds 5# This eclass is for general purpose functions that most ebuilds
8# have to implement themselves. 6# have to implement themselves.
9# 7#
10# NB: If you add anything, please comment it! 8# NB: If you add anything, please comment it!
9#
10# Maintainer: see each individual function, base-system@gentoo.org as default
11 11
12inherit multilib 12inherit multilib portability
13ECLASS=eutils
14INHERITED="$INHERITED $ECLASS"
15
16DEPEND="!bootstrap? ( sys-devel/patch )"
17 13
18DESCRIPTION="Based on the ${ECLASS} eclass" 14DESCRIPTION="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 15
64# Wait for the supplied number of seconds. If no argument is supplied, defaults 16# 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 17# 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 18# outputting to a terminal, don't wait. For compatability purposes, the argument
67# must be an integer greater than zero. 19# must be an integer greater than zero.
68# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004) 20# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004)
69epause() { 21epause() {
70 if [ -z "$EPAUSE_IGNORE" ] && [ -t 1 ] ; then 22 [[ -z ${EPAUSE_IGNORE} ]] && sleep ${1:-5}
71 sleep ${1:-5}
72 fi
73} 23}
74 24
75# Beep the specified number of times (defaults to five). If our output 25# Beep the specified number of times (defaults to five). If our output
76# is not a terminal, don't beep. If the EBEEP_IGNORE env var is set, 26# is not a terminal, don't beep. If the EBEEP_IGNORE env var is set,
77# don't beep. 27# don't beep.
78# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004) 28# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004)
79ebeep() { 29ebeep() {
80 local n 30 local n
81 if [ -z "$EBEEP_IGNORE" ] && [ -t 1 ] ; then 31 if [[ -z ${EBEEP_IGNORE} ]] ; then
82 for ((n=1 ; n <= ${1:-5} ; n++)) ; do 32 for ((n=1 ; n <= ${1:-5} ; n++)) ; do
83 echo -ne "\a" 33 echo -ne "\a"
84 sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null 34 sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
85 echo -ne "\a" 35 echo -ne "\a"
86 sleep 1 36 sleep 1
105# to point to the latest version of the library present. 55# to point to the latest version of the library present.
106# 56#
107# <azarah@gentoo.org> (26 Oct 2002) 57# <azarah@gentoo.org> (26 Oct 2002)
108# 58#
109gen_usr_ldscript() { 59gen_usr_ldscript() {
110 local libdir="$(get_libdir)" 60 local lib libdir=$(get_libdir)
111 # Just make sure it exists 61 # Just make sure it exists
112 dodir /usr/${libdir} 62 dodir /usr/${libdir}
113 63
64 for lib in "${@}" ; do
114 cat > "${D}/usr/${libdir}/${1}" << END_LDSCRIPT 65 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT
115/* GNU ld script 66 /* GNU ld script
116 Because Gentoo have critical dynamic libraries 67 Since Gentoo has critical dynamic libraries
117 in /lib, and the static versions in /usr/lib, we 68 in /lib, and the static versions in /usr/lib,
118 need to have a "fake" dynamic lib in /usr/lib, 69 we need to have a "fake" dynamic lib in /usr/lib,
119 otherwise we run into linking problems. 70 otherwise we run into linking problems.
120 See bug #4411 on http://bugs.gentoo.org/ for 71
121 more info. */ 72 See bug http://bugs.gentoo.org/4411 for more info.
73 */
122GROUP ( /${libdir}/${1} ) 74 GROUP ( /${libdir}/${lib} )
123END_LDSCRIPT 75 END_LDSCRIPT
124 fperms a+x "/usr/${libdir}/${1}" 76 fperms a+x "/usr/${libdir}/${lib}" || die "could not change perms on ${lib}"
125}
126
127# Simple function to draw a line consisting of '=' the same length as $*
128#
129# <azarah@gentoo.org> (11 Nov 2002)
130#
131draw_line() {
132 local i=0
133 local str_length=""
134
135 # Handle calls that do not have args, or wc not being installed ...
136 if [ -z "$1" -o ! -x "$(which wc 2>/dev/null)" ]
137 then
138 echo "==============================================================="
139 return 0
140 fi
141
142 # Get the length of $*
143 str_length="$(echo -n "$*" | wc -m)"
144
145 while [ "$i" -lt "${str_length}" ]
146 do
147 echo -n "="
148
149 i=$((i + 1))
150 done 77 done
151
152 echo
153
154 return 0
155} 78}
79
156 80
157# Default directory where patches are located 81# Default directory where patches are located
158EPATCH_SOURCE="${WORKDIR}/patch" 82EPATCH_SOURCE="${WORKDIR}/patch"
159# Default extension for patches 83# Default extension for patches
160EPATCH_SUFFIX="patch.bz2" 84EPATCH_SUFFIX="patch.bz2"
161# Default options for patch 85# Default options for patch
162# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571 86# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571
163EPATCH_OPTS="-g0" 87# Set --no-backup-if-mismatch so we don't leave '.orig' files behind.
88# Set -E to automatically remove empty files.
89EPATCH_OPTS="-g0 -E --no-backup-if-mismatch"
164# List of patches not to apply. Not this is only file names, 90# List of patches not to apply. Not this is only file names,
165# and not the full path .. 91# and not the full path ..
166EPATCH_EXCLUDE="" 92EPATCH_EXCLUDE=""
167# Change the printed message for a single patch. 93# Change the printed message for a single patch.
168EPATCH_SINGLE_MSG="" 94EPATCH_SINGLE_MSG=""
95# Change the printed message for multiple patches.
96EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..."
169# Force applying bulk patches even if not following the style: 97# Force applying bulk patches even if not following the style:
170# 98#
171# ??_${ARCH}_foo.${EPATCH_SUFFIX} 99# ??_${ARCH}_foo.${EPATCH_SUFFIX}
172# 100#
173EPATCH_FORCE="no" 101EPATCH_FORCE="no"
204# hand its a directory, it will set EPATCH_SOURCE to this. 132# hand its a directory, it will set EPATCH_SOURCE to this.
205# 133#
206# <azarah@gentoo.org> (10 Nov 2002) 134# <azarah@gentoo.org> (10 Nov 2002)
207# 135#
208epatch() { 136epatch() {
137 _epatch_draw_line() {
138 [[ -z $1 ]] && set "$(printf "%65s" '')"
139 echo "${1//?/=}"
140 }
141 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; }
209 local PIPE_CMD="" 142 local PIPE_CMD=""
210 local STDERR_TARGET="${T}/$$.out" 143 local STDERR_TARGET="${T}/$$.out"
211 local PATCH_TARGET="${T}/$$.patch" 144 local PATCH_TARGET="${T}/$$.patch"
212 local PATCH_SUFFIX="" 145 local PATCH_SUFFIX=""
213 local SINGLE_PATCH="no" 146 local SINGLE_PATCH="no"
214 local x="" 147 local x=""
215 148
149 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
150
216 if [ "$#" -gt 1 ] 151 if [ "$#" -gt 1 ]
217 then 152 then
218 local m="" 153 local m=""
219 einfo "${#} patches to apply ..."
220 for m in "$@" ; do 154 for m in "$@" ; do
221 epatch "${m}" 155 epatch "${m}"
222 done 156 done
223 return 0 157 return 0
224 fi 158 fi
278 ;; 212 ;;
279 esac 213 esac
280 214
281 if [ "${SINGLE_PATCH}" = "no" ] 215 if [ "${SINGLE_PATCH}" = "no" ]
282 then 216 then
283 einfo "Applying various patches (bugfixes/updates) ..." 217 einfo "${EPATCH_MULTI_MSG}"
284 fi 218 fi
285 for x in ${EPATCH_SOURCE} 219 for x in ${EPATCH_SOURCE}
286 do 220 do
287 # New ARCH dependant patch naming scheme ... 221 # New ARCH dependant patch naming scheme ...
288 # 222 #
289 # ???_arch_foo.patch 223 # ???_arch_foo.patch
290 # 224 #
291 if [ -f ${x} ] && \ 225 if [ -f ${x} ] && \
292 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "`eval echo \$\{x/_${ARCH}_\}`" != "${x}" ] || \ 226 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "${x/_${ARCH}_}" != "${x}" ] || \
293 [ "${EPATCH_FORCE}" = "yes" ]) 227 [ "${EPATCH_FORCE}" = "yes" ])
294 then 228 then
295 local count=0 229 local count=0
296 local popts="${EPATCH_OPTS}" 230 local popts="${EPATCH_OPTS}"
297 local patchname=${x##*/} 231 local patchname=${x##*/}
321 255
322 # Allow for prefix to differ ... im lazy, so shoot me :/ 256 # Allow for prefix to differ ... im lazy, so shoot me :/
323 while [ "${count}" -lt 5 ] 257 while [ "${count}" -lt 5 ]
324 do 258 do
325 # Generate some useful debug info ... 259 # Generate some useful debug info ...
326 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 260 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
327 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 261 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
328 262
329 if [ "${PATCH_SUFFIX}" != "patch" ] 263 if [ "${PATCH_SUFFIX}" != "patch" ]
330 then 264 then
331 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 265 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
336 270
337 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 271 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
338 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 272 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
339 273
340 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 274 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
341 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 275 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
342 276
343 if [ "${PATCH_SUFFIX}" != "patch" ] 277 if [ "${PATCH_SUFFIX}" != "patch" ]
344 then 278 then
345 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1 279 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
346 then 280 then
350 count=5 284 count=5
351 break 285 break
352 fi 286 fi
353 fi 287 fi
354 288
355 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1 289 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f ; _epatch_assert) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
356 then 290 then
357 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 291 _epatch_draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
358 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 292 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
359 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 293 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
360 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 294 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
361 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 295 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
362 296
363 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1 297 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
298 _epatch_assert
364 299
365 if [ "$?" -ne 0 ] 300 if [ "$?" -ne 0 ]
366 then 301 then
367 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 302 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
368 echo 303 echo
407 then 342 then
408 einfo "Done with patching" 343 einfo "Done with patching"
409 fi 344 fi
410} 345}
411 346
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) 347# Cheap replacement for when debianutils (and thus mktemp)
539# does not exist on the users system 348# does not exist on the users system
540# vapier@gentoo.org 349# vapier@gentoo.org
541# 350#
542# Takes just 1 optional parameter (the directory to create tmpfile in) 351# Takes just 1 optional parameter (the directory to create tmpfile in)
543emktemp() { 352emktemp() {
544 local exe="touch" 353 local exe="touch"
545 [ "$1" == "-d" ] && exe="mkdir" && shift 354 [[ $1 == -d ]] && exe="mkdir" && shift
546 local topdir="$1" 355 local topdir=$1
547 356
548 if [ -z "${topdir}" ] 357 if [[ -z ${topdir} ]] ; then
549 then
550 [ -z "${T}" ] \ 358 [[ -z ${T} ]] \
551 && topdir="/tmp" \ 359 && topdir="/tmp" \
552 || topdir="${T}" 360 || topdir=${T}
553 fi 361 fi
554 362
555 if [ -z "$(type -p mktemp)" ] 363 if [[ -z $(type -p mktemp) ]] ; then
556 then
557 local tmp=/ 364 local tmp=/
558 while [ -e "${tmp}" ] ; do 365 while [[ -e ${tmp} ]] ; do
559 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 366 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
560 done 367 done
561 ${exe} "${tmp}" 368 ${exe} "${tmp}" || ${exe} -p "${tmp}"
562 echo "${tmp}" 369 echo "${tmp}"
563 else 370 else
564 [ "${exe}" == "touch" ] \ 371 if [[ ${exe} == "touch" ]] ; then
565 && exe="-p" \ 372 [[ ${USERLAND} == "GNU" ]] \
566 || exe="-d" 373 && mktemp -p "${topdir}" \
567 mktemp ${exe} "${topdir}" 374 || TMPDIR="${topdir}" mktemp -t tmp
375 else
376 [[ ${USERLAND} == "GNU" ]] \
377 && mktemp -d "${topdir}" \
378 || TMPDIR="${topdir}" mktemp -dt tmp
379 fi
568 fi 380 fi
569} 381}
570 382
571# Small wrapper for getent (Linux), nidump (Mac OS X), 383# Small wrapper for getent (Linux), nidump (Mac OS X),
572# and pw (FreeBSD) used in enewuser()/enewgroup() 384# and pw (FreeBSD) used in enewuser()/enewgroup()
573# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 385# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
574# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 386# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
575# 387#
576# egetent(database, key) 388# egetent(database, key)
577egetent() { 389egetent() {
578 if useq ppc-macos ; then 390 case ${CHOST} in
391 *-darwin*)
579 case "$2" in 392 case "$2" in
580 *[!0-9]*) # Non numeric 393 *[!0-9]*) # Non numeric
581 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 394 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
582 ;; 395 ;;
583 *) # Numeric 396 *) # Numeric
584 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 397 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
585 ;; 398 ;;
586 esac 399 esac
587 elif useq x86-fbsd ; then 400 ;;
588 local action 401 *-freebsd*|*-dragonfly*)
589 if [ "$1" == "passwd" ] 402 local opts action="user"
590 then 403 [[ $1 == "passwd" ]] || action="group"
591 action="user" 404
592 else 405 # lookup by uid/gid
593 action="group" 406 if [[ $2 == [[:digit:]]* ]] ; then
407 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
594 fi 408 fi
409
595 pw show "${action}" "$2" -q 410 pw show ${action} ${opts} "$2" -q
596 else 411 ;;
412 *-netbsd*|*-openbsd*)
413 grep "$2:\*:" /etc/$1
414 ;;
415 *)
597 which nscd >& /dev/null && nscd -i "$1" 416 type -p nscd >& /dev/null && nscd -i "$1"
598 getent "$1" "$2" 417 getent "$1" "$2"
599 fi 418 ;;
419 esac
600} 420}
601 421
602# Simplify/standardize adding users to the system 422# Simplify/standardize adding users to the system
603# vapier@gentoo.org 423# vapier@gentoo.org
604# 424#
611# shell: /bin/false 431# shell: /bin/false
612# homedir: /dev/null 432# homedir: /dev/null
613# groups: none 433# groups: none
614# extra: comment of 'added by portage for ${PN}' 434# extra: comment of 'added by portage for ${PN}'
615enewuser() { 435enewuser() {
436 case ${EBUILD_PHASE} in
437 unpack|compile|test|install)
438 eerror "'enewuser()' called from '${EBUILD_PHASE}()' which is not a pkg_* function."
439 eerror "Package fails at QA and at life. Please file a bug."
440 die "Bad package! enewuser is only for use in pkg_* functions!"
441 esac
442
616 # get the username 443 # get the username
617 local euser="$1"; shift 444 local euser=$1; shift
618 if [ -z "${euser}" ] 445 if [[ -z ${euser} ]] ; then
619 then
620 eerror "No username specified !" 446 eerror "No username specified !"
621 die "Cannot call enewuser without a username" 447 die "Cannot call enewuser without a username"
622 fi 448 fi
623 449
624 # lets see if the username already exists 450 # lets see if the username already exists
625 if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ] 451 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then
626 then
627 return 0 452 return 0
628 fi 453 fi
629 einfo "Adding user '${euser}' to your system ..." 454 einfo "Adding user '${euser}' to your system ..."
630 455
631 # options to pass to useradd 456 # options to pass to useradd
632 local opts= 457 local opts=
633 458
634 # handle uid 459 # handle uid
635 local euid="$1"; shift 460 local euid=$1; shift
636 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] 461 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then
637 then
638 if [ "${euid}" -gt 0 ] 462 if [[ ${euid} -gt 0 ]] ; then
639 then
640 if [ ! -z "`egetent passwd ${euid}`" ] 463 if [[ ! -z $(egetent passwd ${euid}) ]] ; then
641 then
642 euid="next" 464 euid="next"
643 fi 465 fi
644 else 466 else
645 eerror "Userid given but is not greater than 0 !" 467 eerror "Userid given but is not greater than 0 !"
646 die "${euid} is not a valid UID" 468 die "${euid} is not a valid UID"
647 fi 469 fi
648 else 470 else
649 euid="next" 471 euid="next"
650 fi 472 fi
651 if [ "${euid}" == "next" ] 473 if [[ ${euid} == "next" ]] ; then
652 then 474 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 475 [[ -z $(egetent passwd ${euid}) ]] && break
661 done 476 done
662 fi 477 fi
663 opts="${opts} -u ${euid}" 478 opts="${opts} -u ${euid}"
664 einfo " - Userid: ${euid}" 479 einfo " - Userid: ${euid}"
665 480
666 # handle shell 481 # handle shell
667 local eshell="$1"; shift 482 local eshell=$1; shift
668 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ] 483 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
669 then 484 if [[ ! -e ${ROOT}${eshell} ]] ; then
670 if [ ! -e "${eshell}" ]
671 then
672 eerror "A shell was specified but it does not exist !" 485 eerror "A shell was specified but it does not exist !"
673 die "${eshell} does not exist" 486 die "${eshell} does not exist in ${ROOT}"
487 fi
488 if [[ ${eshell} == */false || ${eshell} == */nologin ]] ; then
489 eerror "Do not specify ${eshell} yourself, use -1"
490 die "Pass '-1' as the shell parameter"
674 fi 491 fi
675 else 492 else
676 if [ "${USERLAND}" == "BSD" ] 493 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
677 then 494 [[ -x ${ROOT}${shell} ]] && break
678 eshell="/usr/bin/false" 495 done
679 else 496
680 eshell="/bin/false" 497 if [[ ${shell} == "/dev/null" ]] ; then
498 eerror "Unable to identify the shell to use"
499 die "Unable to identify the shell to use"
681 fi 500 fi
501
502 eshell=${shell}
682 fi 503 fi
683 einfo " - Shell: ${eshell}" 504 einfo " - Shell: ${eshell}"
684 opts="${opts} -s ${eshell}" 505 opts="${opts} -s ${eshell}"
685 506
686 # handle homedir 507 # handle homedir
687 local ehome="$1"; shift 508 local ehome=$1; shift
688 if [ -z "${ehome}" ] && [ "${eshell}" != "-1" ] 509 if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then
689 then
690 ehome="/dev/null" 510 ehome="/dev/null"
691 fi 511 fi
692 einfo " - Home: ${ehome}" 512 einfo " - Home: ${ehome}"
693 opts="${opts} -d ${ehome}" 513 opts="${opts} -d ${ehome}"
694 514
695 # handle groups 515 # handle groups
696 local egroups="$1"; shift 516 local egroups=$1; shift
697 if [ ! -z "${egroups}" ] 517 if [[ ! -z ${egroups} ]] ; then
698 then
699 local oldifs="${IFS}" 518 local oldifs=${IFS}
700 local defgroup="" exgroups="" 519 local defgroup="" exgroups=""
701 520
702 export IFS="," 521 export IFS=","
703 for g in ${egroups} 522 for g in ${egroups} ; do
704 do
705 export IFS="${oldifs}" 523 export IFS=${oldifs}
706 if [ -z "`egetent group \"${g}\"`" ] 524 if [[ -z $(egetent group "${g}") ]] ; then
707 then
708 eerror "You must add group ${g} to the system first" 525 eerror "You must add group ${g} to the system first"
709 die "${g} is not a valid GID" 526 die "${g} is not a valid GID"
710 fi 527 fi
711 if [ -z "${defgroup}" ] 528 if [[ -z ${defgroup} ]] ; then
712 then
713 defgroup="${g}" 529 defgroup=${g}
714 else 530 else
715 exgroups="${exgroups},${g}" 531 exgroups="${exgroups},${g}"
716 fi 532 fi
717 export IFS="," 533 export IFS=","
718 done 534 done
719 export IFS="${oldifs}" 535 export IFS=${oldifs}
720 536
721 opts="${opts} -g ${defgroup}" 537 opts="${opts} -g ${defgroup}"
722 if [ ! -z "${exgroups}" ] 538 if [[ ! -z ${exgroups} ]] ; then
723 then
724 opts="${opts} -G ${exgroups:1}" 539 opts="${opts} -G ${exgroups:1}"
725 fi 540 fi
726 else 541 else
727 egroups="(none)" 542 egroups="(none)"
728 fi 543 fi
729 einfo " - Groups: ${egroups}" 544 einfo " - Groups: ${egroups}"
730 545
731 # handle extra and add the user 546 # handle extra and add the user
732 local eextra="$@"
733 local oldsandbox="${SANDBOX_ON}" 547 local oldsandbox=${SANDBOX_ON}
734 export SANDBOX_ON="0" 548 export SANDBOX_ON="0"
735 if useq ppc-macos 549 case ${CHOST} in
736 then 550 *-darwin*)
737 ### Make the user 551 ### Make the user
738 if [ -z "${eextra}" ] 552 if [[ -z $@ ]] ; then
739 then
740 dscl . create /users/${euser} uid ${euid} 553 dscl . create /users/${euser} uid ${euid}
741 dscl . create /users/${euser} shell ${eshell} 554 dscl . create /users/${euser} shell ${eshell}
742 dscl . create /users/${euser} home ${ehome} 555 dscl . create /users/${euser} home ${ehome}
743 dscl . create /users/${euser} realname "added by portage for ${PN}" 556 dscl . create /users/${euser} realname "added by portage for ${PN}"
744 ### Add the user to the groups specified 557 ### Add the user to the groups specified
745 local oldifs="${IFS}" 558 local oldifs=${IFS}
746 export IFS="," 559 export IFS=","
747 for g in ${egroups} 560 for g in ${egroups} ; do
748 do
749 dscl . merge /groups/${g} users ${euser} 561 dscl . merge /groups/${g} users ${euser}
750 done 562 done
751 export IFS="${oldifs}" 563 export IFS=${oldifs}
752 else 564 else
753 einfo "Extra options are not supported on macos yet" 565 einfo "Extra options are not supported on Darwin yet"
754 einfo "Please report the ebuild along with the info below" 566 einfo "Please report the ebuild along with the info below"
755 einfo "eextra: ${eextra}" 567 einfo "eextra: $@"
756 die "Required function missing" 568 die "Required function missing"
757 fi 569 fi
758 elif use x86-fbsd ; then 570 ;;
759 if [ -z "${eextra}" ] 571 *-freebsd*|*-dragonfly*)
760 then 572 if [[ -z $@ ]] ; then
761 pw useradd ${euser} ${opts} \ 573 pw useradd ${euser} ${opts} \
762 -c "added by portage for ${PN}" \ 574 -c "added by portage for ${PN}" \
763 die "enewuser failed" 575 die "enewuser failed"
764 else 576 else
765 einfo " - Extra: ${eextra}" 577 einfo " - Extra: $@"
766 pw useradd ${euser} ${opts} \ 578 pw useradd ${euser} ${opts} \
767 -c ${eextra} || die "enewuser failed" 579 "$@" || die "enewuser failed"
768 fi 580 fi
581 ;;
582
583 *-netbsd*)
584 if [[ -z $@ ]] ; then
585 useradd ${opts} ${euser} || die "enewuser failed"
769 else 586 else
770 if [ -z "${eextra}" ] 587 einfo " - Extra: $@"
771 then 588 useradd ${opts} ${euser} "$@" || die "enewuser failed"
589 fi
590 ;;
591
592 *-openbsd*)
593 if [[ -z $@ ]] ; then
594 useradd -u ${euid} -s ${eshell} \
595 -d ${ehome} -c "Added by portage for ${PN}" \
596 -g ${egroups} ${euser} || die "enewuser failed"
597 else
598 einfo " - Extra: $@"
599 useradd -u ${euid} -s ${eshell} \
600 -d ${ehome} -c "Added by portage for ${PN}" \
601 -g ${egroups} ${euser} "$@" || die "enewuser failed"
602 fi
603 ;;
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#
797# Default values if you do not specify any: 633# Default values if you do not specify any:
798# groupname: REQUIRED ! 634# groupname: REQUIRED !
799# gid: next available (see groupadd(8)) 635# gid: next available (see groupadd(8))
800# extra: none 636# extra: none
801enewgroup() { 637enewgroup() {
638 case ${EBUILD_PHASE} in
639 unpack|compile|test|install)
640 eerror "'enewgroup()' called from '${EBUILD_PHASE}()' which is not a pkg_* function."
641 eerror "Package fails at QA and at life. Please file a bug."
642 die "Bad package! enewgroup is only for use in pkg_* functions!"
643 esac
644
802 # get the group 645 # get the group
803 local egroup="$1"; shift 646 local egroup="$1"; shift
804 if [ -z "${egroup}" ] 647 if [ -z "${egroup}" ]
805 then 648 then
806 eerror "No group specified !" 649 eerror "No group specified !"
823 then 666 then
824 if [ "${egid}" -gt 0 ] 667 if [ "${egid}" -gt 0 ]
825 then 668 then
826 if [ -z "`egetent group ${egid}`" ] 669 if [ -z "`egetent group ${egid}`" ]
827 then 670 then
828 if useq ppc-macos ; then 671 if [[ "${CHOST}" == *-darwin* ]]; then
829 opts="${opts} ${egid}" 672 opts="${opts} ${egid}"
830 else 673 else
831 opts="${opts} -g ${egid}" 674 opts="${opts} -g ${egid}"
832 fi 675 fi
833 else 676 else
847 opts="${opts} ${eextra}" 690 opts="${opts} ${eextra}"
848 691
849 # add the group 692 # add the group
850 local oldsandbox="${SANDBOX_ON}" 693 local oldsandbox="${SANDBOX_ON}"
851 export SANDBOX_ON="0" 694 export SANDBOX_ON="0"
852 if useq ppc-macos ; then 695 case ${CHOST} in
696 *-darwin*)
853 if [ ! -z "${eextra}" ]; 697 if [ ! -z "${eextra}" ];
854 then 698 then
855 einfo "Extra options are not supported on macos yet" 699 einfo "Extra options are not supported on Darwin/OS X yet"
856 einfo "Please report the ebuild along with the info below" 700 einfo "Please report the ebuild along with the info below"
857 einfo "eextra: ${eextra}" 701 einfo "eextra: ${eextra}"
858 die "Required function missing" 702 die "Required function missing"
859 fi 703 fi
860 704
861 # If we need the next available 705 # If we need the next available
862 case ${egid} in 706 case ${egid} in
863 *[!0-9]*) # Non numeric 707 *[!0-9]*) # Non numeric
864 for egid in `jot 898 101`; do 708 for egid in $(seq 101 999); do
865 [ -z "`egetent group ${egid}`" ] && break 709 [ -z "`egetent group ${egid}`" ] && break
866 done 710 done
867 esac 711 esac
868 dscl . create /groups/${egroup} gid ${egid} 712 dscl . create /groups/${egroup} gid ${egid}
869 dscl . create /groups/${egroup} passwd '*' 713 dscl . create /groups/${egroup} passwd '*'
870 elif use x86-fbsd ; then 714 ;;
715
716 *-freebsd*|*-dragonfly*)
871 case ${egid} in 717 case ${egid} in
872 *[!0-9]*) # Non numeric 718 *[!0-9]*) # Non numeric
873 for egid in `jot 898 101`; do 719 for egid in $(seq 101 999); do
874 [ -z "`egetent group ${egid}`" ] && break 720 [ -z "`egetent group ${egid}`" ] && break
875 done 721 done
876 esac 722 esac
877 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 723 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
878 else 724 ;;
725
726 *-netbsd*)
727 case ${egid} in
728 *[!0-9]*) # Non numeric
729 for egid in $(seq 101 999); do
730 [ -z "`egetent group ${egid}`" ] && break
731 done
732 esac
733 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
734 ;;
735
736 *)
879 groupadd ${opts} ${egroup} || die "enewgroup failed" 737 groupadd ${opts} ${egroup} || die "enewgroup failed"
880 fi 738 ;;
739 esac
881 export SANDBOX_ON="${oldsandbox}" 740 export SANDBOX_ON="${oldsandbox}"
882} 741}
883 742
884# Simple script to replace 'dos2unix' binaries 743# Simple script to replace 'dos2unix' binaries
885# vapier@gentoo.org 744# vapier@gentoo.org
902 761
903# Make a desktop file ! 762# Make a desktop file !
904# Great for making those icons in kde/gnome startmenu ! 763# Great for making those icons in kde/gnome startmenu !
905# Amaze your friends ! Get the women ! Join today ! 764# Amaze your friends ! Get the women ! Join today !
906# 765#
907# make_desktop_entry(<binary>, [name], [icon], [type], [path]) 766# make_desktop_entry(<command>, [name], [icon], [type], [path])
908# 767#
909# binary: what binary does the app run with ? 768# binary: what command does the app run with ?
910# name: the name that will show up in the menu 769# name: the name that will show up in the menu
911# icon: give your little like a pretty little icon ... 770# icon: give your little like a pretty little icon ...
912# this can be relative (to /usr/share/pixmaps) or 771# this can be relative (to /usr/share/pixmaps) or
913# a full path to an icon 772# a full path to an icon
914# type: what kind of application is this ? for categories: 773# type: what kind of application is this ? for categories:
915# http://www.freedesktop.org/wiki/Standards_2fmenu_2dspec 774# http://www.freedesktop.org/Standards/desktop-entry-spec
916# path: if your app needs to startup in a specific dir 775# path: if your app needs to startup in a specific dir
917make_desktop_entry() { 776make_desktop_entry() {
918 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1 777 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
919 778
920 local exec=${1} 779 local exec=${1}
942 *) type=;; 801 *) type=;;
943 esac 802 esac
944 ;; 803 ;;
945 804
946 dev) 805 dev)
947 type=Development 806 type="Development"
948 ;; 807 ;;
949 808
950 games) 809 games)
951 [[ -z ${path} ]] && path=${GAMES_BINDIR}
952
953 case ${catmin} in 810 case ${catmin} in
954 action) type=ActionGame;; 811 action) type=ActionGame;;
955 arcade) type=ArcadeGame;; 812 arcade) type=ArcadeGame;;
956 board) type=BoardGame;; 813 board) type=BoardGame;;
957 kid) type=KidsGame;; 814 kid) type=KidsGame;;
962 simulation) type=Simulation;; 819 simulation) type=Simulation;;
963 sports) type=SportsGame;; 820 sports) type=SportsGame;;
964 strategy) type=StrategyGame;; 821 strategy) type=StrategyGame;;
965 *) type=;; 822 *) type=;;
966 esac 823 esac
967 type=Game;${type} 824 type="Game;${type}"
968 ;; 825 ;;
969 826
970 mail) 827 mail)
971 type=Network;Email 828 type="Network;Email"
972 ;; 829 ;;
973 830
974 media) 831 media)
975 case ${catmin} in 832 case ${catmin} in
976 gfx) type=Graphics;; 833 gfx) type=Graphics;;
978 sound) type=Audio;; 835 sound) type=Audio;;
979 tv) type=TV;; 836 tv) type=TV;;
980 video) type=Video;; 837 video) type=Video;;
981 *) type=;; 838 *) type=;;
982 esac 839 esac
983 type=AudioVideo;${type} 840 type="AudioVideo;${type}"
984 ;; 841 ;;
985 842
986 net) 843 net)
987 case ${catmin} in 844 case ${catmin} in
988 dialup) type=Dialup;; 845 dialup) type=Dialup;;
993 news) type=News;; 850 news) type=News;;
994 nntp) type=News;; 851 nntp) type=News;;
995 p2p) type=FileTransfer;; 852 p2p) type=FileTransfer;;
996 *) type=;; 853 *) type=;;
997 esac 854 esac
998 type=Network;${type} 855 type="Network;${type}"
999 ;; 856 ;;
1000 857
1001 sci) 858 sci)
1002 case ${catmin} in 859 case ${catmin} in
1003 astro*) type=Astronomoy;; 860 astro*) type=Astronomy;;
1004 bio*) type=Biology;; 861 bio*) type=Biology;;
1005 calc*) type=Calculator;; 862 calc*) type=Calculator;;
1006 chem*) type=Chemistry;; 863 chem*) type=Chemistry;;
1007 geo*) type=Geology;; 864 geo*) type=Geology;;
1008 math*) type=Math;; 865 math*) type=Math;;
1009 *) type=;; 866 *) type=;;
1010 esac 867 esac
1011 type=Science;${type} 868 type="Science;${type}"
1012 ;; 869 ;;
1013 870
1014 www) 871 www)
1015 case ${catmin} in 872 case ${catmin} in
1016 client) type=WebBrowser;; 873 client) type=WebBrowser;;
1017 *) type=;; 874 *) type=;;
1018 esac 875 esac
1019 type=Network 876 type="Network"
1020 ;; 877 ;;
1021 878
1022 *) 879 *)
1023 type= 880 type=
1024 ;; 881 ;;
1025 esac 882 esac
1026 fi 883 fi
1027 884 if [ "${SLOT}" == "0" ] ; then
885 local desktop_name="${PN}"
886 else
887 local desktop_name="${PN}-${SLOT}"
888 fi
1028 local desktop=${T}/${exec%% *}-${P}.desktop 889 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
890# local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
1029 891
1030echo "[Desktop Entry] 892echo "[Desktop Entry]
1031Encoding=UTF-8 893Encoding=UTF-8
1032Version=0.9.2 894Version=0.9.2
1033Name=${name} 895Name=${name}
1034Type=Application 896Type=Application
1035Comment=${DESCRIPTION} 897Comment=${DESCRIPTION}
1036Exec=${exec} 898Exec=${exec}
899TryExec=${exec%% *}
1037Path=${path} 900Path=${path}
1038Icon=${icon} 901Icon=${icon}
1039Categories=Application;${type};" > "${desktop}" 902Categories=Application;${type};" > "${desktop}"
1040 903
904 (
905 # wrap the env here so that the 'insinto' call
906 # doesn't corrupt the env of the caller
1041 insinto /usr/share/applications 907 insinto /usr/share/applications
1042 doins "${desktop}" 908 doins "${desktop}"
1043 909 )
1044 return 0
1045} 910}
1046 911
1047# Make a GDM/KDM Session file 912# Make a GDM/KDM Session file
1048# 913#
1049# make_desktop_entry(<title>, <command>) 914# make_desktop_entry(<title>, <command>)
1050# title: File to execute to start the Window Manager 915# title: File to execute to start the Window Manager
1051# command: Name of the Window Manager 916# command: Name of the Window Manager
1052 917
1053make_session_desktop() { 918make_session_desktop() {
1054
1055 [ -z "$1" ] && eerror "make_session_desktop: You must specify the title" && return 1 919 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1
1056 [ -z "$2" ] && eerror "make_session_desktop: You must specify the command" && return 1 920 [[ -z $2 ]] && eerror "make_session_desktop: You must specify the command" && return 1
1057 921
1058 local title="${1}" 922 local title=$1
1059 local command="${2}" 923 local command=$2
1060 local desktop="${T}/${wm}.desktop" 924 local desktop=${T}/${wm}.desktop
1061 925
1062echo "[Desktop Entry] 926echo "[Desktop Entry]
1063Encoding=UTF-8 927Encoding=UTF-8
1064Name=${title} 928Name=${title}
1065Comment=This session logs you into ${title} 929Comment=This session logs you into ${title}
1067TryExec=${command} 931TryExec=${command}
1068Type=Application" > "${desktop}" 932Type=Application" > "${desktop}"
1069 933
1070 insinto /usr/share/xsessions 934 insinto /usr/share/xsessions
1071 doins "${desktop}" 935 doins "${desktop}"
1072
1073 return 0
1074} 936}
1075 937
1076domenu() { 938domenu() {
1077 local i 939 local i j
1078 local j
1079 insinto /usr/share/applications 940 insinto /usr/share/applications
1080 for i in ${@} 941 for i in "$@" ; do
1081 do
1082 if [ -f "${i}" ]; 942 if [[ -f ${i} ]] ; then
1083 then
1084 doins ${i} 943 doins "${i}"
1085 elif [ -d "${i}" ]; 944 elif [[ -d ${i} ]] ; then
1086 then
1087 for j in ${i}/*.desktop 945 for j in "${i}"/*.desktop ; do
1088 do
1089 doins ${j} 946 doins "${j}"
1090 done 947 done
1091 fi 948 fi
1092 done 949 done
1093} 950}
951newmenu() {
952 insinto /usr/share/applications
953 newins "$1" "$2"
954}
1094 955
1095doicon() { 956doicon() {
1096 local i 957 local i j
1097 local j
1098 insinto /usr/share/pixmaps 958 insinto /usr/share/pixmaps
1099 for i in ${@} 959 for i in "$@" ; do
1100 do
1101 if [ -f "${i}" ]; 960 if [[ -f ${i} ]] ; then
1102 then
1103 doins ${i} 961 doins "${i}"
1104 elif [ -d "${i}" ]; 962 elif [[ -d ${i} ]] ; then
1105 then
1106 for j in ${i}/*.png 963 for j in "${i}"/*.png ; do
1107 do
1108 doins ${j} 964 doins "${j}"
1109 done 965 done
1110 fi 966 fi
1111 done 967 done
968}
969newicon() {
970 insinto /usr/share/pixmaps
971 newins "$1" "$2"
1112} 972}
1113 973
1114############################################################## 974##############################################################
1115# END: Handle .desktop files and menu entries # 975# END: Handle .desktop files and menu entries #
1116############################################################## 976##############################################################
1117 977
1118 978
1119# for internal use only (unpack_pdv and unpack_makeself) 979# for internal use only (unpack_pdv and unpack_makeself)
1120find_unpackable_file() { 980find_unpackable_file() {
1121 local src="$1" 981 local src=$1
1122 if [ -z "${src}" ] 982 if [[ -z ${src} ]] ; then
1123 then
1124 src="${DISTDIR}/${A}" 983 src=${DISTDIR}/${A}
1125 else 984 else
1126 if [ -e "${DISTDIR}/${src}" ] 985 if [[ -e ${DISTDIR}/${src} ]] ; then
1127 then
1128 src="${DISTDIR}/${src}" 986 src=${DISTDIR}/${src}
1129 elif [ -e "${PWD}/${src}" ] 987 elif [[ -e ${PWD}/${src} ]] ; then
1130 then
1131 src="${PWD}/${src}" 988 src=${PWD}/${src}
1132 elif [ -e "${src}" ] 989 elif [[ -e ${src} ]] ; then
1133 then
1134 src="${src}" 990 src=${src}
1135 fi
1136 fi 991 fi
1137 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 992 fi
993 [[ ! -e ${src} ]] && return 1
1138 echo "${src}" 994 echo "${src}"
1139} 995}
1140 996
1141# Unpack those pesky pdv generated files ... 997# Unpack those pesky pdv generated files ...
1142# They're self-unpacking programs with the binary package stuffed in 998# They're self-unpacking programs with the binary package stuffed in
1157# lseek 1013# lseek
1158# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1014# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
1159# lseek(3, -4, SEEK_END) = 2981250 1015# lseek(3, -4, SEEK_END) = 2981250
1160# thus we would pass in the value of '4' as the second parameter. 1016# thus we would pass in the value of '4' as the second parameter.
1161unpack_pdv() { 1017unpack_pdv() {
1162 local src="`find_unpackable_file $1`" 1018 local src=$(find_unpackable_file $1)
1163 local sizeoff_t="$2" 1019 local sizeoff_t=$2
1164 1020
1021 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1165 [ -z "${sizeoff_t}" ] && die "No idea what off_t size was used for this pdv :(" 1022 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
1166 1023
1167 local shrtsrc="`basename ${src}`" 1024 local shrtsrc=$(basename "${src}")
1168 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1025 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1169 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1026 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
1170 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"` 1027 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
1171 1028
1172 # grab metadata for debug reasons 1029 # grab metadata for debug reasons
1236# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1093# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1237# - If the file is not specified then unpack will utilize ${A}. 1094# - If the file is not specified then unpack will utilize ${A}.
1238# - If the offset is not specified then we will attempt to extract 1095# - If the offset is not specified then we will attempt to extract
1239# the proper offset from the script itself. 1096# the proper offset from the script itself.
1240unpack_makeself() { 1097unpack_makeself() {
1098 local src_input=${1:-${A}}
1241 local src="$(find_unpackable_file "$1")" 1099 local src=$(find_unpackable_file "${src_input}")
1242 local skip="$2" 1100 local skip=$2
1243 local exe="$3" 1101 local exe=$3
1244 1102
1103 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1104
1245 local shrtsrc="$(basename "${src}")" 1105 local shrtsrc=$(basename "${src}")
1246 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1106 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1247 if [ -z "${skip}" ] 1107 if [[ -z ${skip} ]] ; then
1248 then
1249 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1108 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1250 local skip=0 1109 local skip=0
1251 exe=tail 1110 exe=tail
1252 case ${ver} in 1111 case ${ver} in
1253 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1112 1.5.*|1.6.0-nv) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
1254 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1113 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1255 ;; 1114 ;;
1256 2.0|2.0.1) 1115 2.0|2.0.1)
1257 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-) 1116 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-)
1258 ;; 1117 ;;
1266 ;; 1125 ;;
1267 2.1.3) 1126 2.1.3)
1268 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1127 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1269 let skip="skip + 1" 1128 let skip="skip + 1"
1270 ;; 1129 ;;
1271 2.1.4) 1130 2.1.4|2.1.5)
1272 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1) 1131 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
1273 skip=$(head -n ${skip} "${src}" | wc -c) 1132 skip=$(head -n ${skip} "${src}" | wc -c)
1274 exe="dd" 1133 exe="dd"
1275 ;; 1134 ;;
1276 *) 1135 *)
1321check_license() { 1180check_license() {
1322 local lic=$1 1181 local lic=$1
1323 if [ -z "${lic}" ] ; then 1182 if [ -z "${lic}" ] ; then
1324 lic="${PORTDIR}/licenses/${LICENSE}" 1183 lic="${PORTDIR}/licenses/${LICENSE}"
1325 else 1184 else
1326 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1185 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1327 lic="${PORTDIR}/licenses/${src}" 1186 lic="${PORTDIR}/licenses/${lic}"
1328 elif [ -e "${PWD}/${src}" ] ; then 1187 elif [ -e "${PWD}/${lic}" ] ; then
1329 lic="${PWD}/${src}" 1188 lic="${PWD}/${lic}"
1330 elif [ -e "${src}" ] ; then 1189 elif [ -e "${lic}" ] ; then
1331 lic="${src}" 1190 lic="${lic}"
1332 fi
1333 fi 1191 fi
1192 fi
1334 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1193 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1335 local l="`basename ${lic}`" 1194 local l="`basename ${lic}`"
1336 1195
1337 # here is where we check for the licenses the user already 1196 # here is where we check for the licenses the user already
1338 # accepted ... if we don't find a match, we make the user accept 1197 # accepted ... if we don't find a match, we make the user accept
1339 local shopts=$- 1198 local shopts=$-
1381# and when the function returns, you can assume that the cd has been 1240# and when the function returns, you can assume that the cd has been
1382# found at CDROM_ROOT. 1241# found at CDROM_ROOT.
1383# 1242#
1384# normally the cdrom functions will refer to the cds as 'cd #1', 'cd #2', 1243# normally the cdrom functions will refer to the cds as 'cd #1', 'cd #2',
1385# etc... if you want to give the cds better names, then just export 1244# etc... if you want to give the cds better names, then just export
1386# the CDROM_NAME_X variables before calling cdrom_get_cds(). 1245# the appropriate CDROM_NAME variable before calling cdrom_get_cds().
1246# - CDROM_NAME="fooie cd" - for when you only want 1 cd
1247# - CDROM_NAME_1="install cd" - for when you want more than 1 cd
1248# CDROM_NAME_2="data cd"
1249# - CDROM_NAME_SET=( "install cd" "data cd" ) - short hand for CDROM_NAME_#
1387# 1250#
1388# for those multi cd ebuilds, see the cdrom_load_next_cd() below. 1251# for those multi cd ebuilds, see the cdrom_load_next_cd() below.
1389# 1252#
1390# Usage: cdrom_get_cds <file on cd1> [file on cd2] [file on cd3] [...] 1253# Usage: cdrom_get_cds <file on cd1> [file on cd2] [file on cd3] [...]
1391# - this will attempt to locate a cd based upon a file that is on 1254# - this will attempt to locate a cd based upon a file that is on
1395 # first we figure out how many cds we're dealing with by 1258 # first we figure out how many cds we're dealing with by
1396 # the # of files they gave us 1259 # the # of files they gave us
1397 local cdcnt=0 1260 local cdcnt=0
1398 local f= 1261 local f=
1399 for f in "$@" ; do 1262 for f in "$@" ; do
1400 cdcnt=$((cdcnt + 1)) 1263 ((++cdcnt))
1401 export CDROM_CHECK_${cdcnt}="$f" 1264 export CDROM_CHECK_${cdcnt}="$f"
1402 done 1265 done
1403 export CDROM_TOTAL_CDS=${cdcnt} 1266 export CDROM_TOTAL_CDS=${cdcnt}
1404 export CDROM_CURRENT_CD=1 1267 export CDROM_CURRENT_CD=1
1405 1268
1406 # now we see if the user gave use CD_ROOT ... 1269 # now we see if the user gave use CD_ROOT ...
1407 # if they did, let's just believe them that it's correct 1270 # if they did, let's just believe them that it's correct
1408 if [[ ! -z ${CD_ROOT} ]] ; then
1409 export CDROM_ROOT=${CD_ROOT}
1410 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1411 return
1412 fi
1413 # do the same for CD_ROOT_X
1414 if [[ ! -z ${CD_ROOT_1} ]] ; then 1271 if [[ -n ${CD_ROOT}${CD_ROOT_1} ]] ; then
1415 local var= 1272 local var=
1416 cdcnt=0 1273 cdcnt=0
1417 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1274 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1418 cdcnt=$((cdcnt + 1)) 1275 ((++cdcnt))
1419 var="CD_ROOT_${cdcnt}" 1276 var="CD_ROOT_${cdcnt}"
1277 [[ -z ${!var} ]] && var="CD_ROOT"
1420 if [[ -z ${!var} ]] ; then 1278 if [[ -z ${!var} ]] ; then
1421 eerror "You must either use just the CD_ROOT" 1279 eerror "You must either use just the CD_ROOT"
1422 eerror "or specify ALL the CD_ROOT_X variables." 1280 eerror "or specify ALL the CD_ROOT_X variables."
1423 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables." 1281 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."
1424 die "could not locate CD_ROOT_${cdcnt}" 1282 die "could not locate CD_ROOT_${cdcnt}"
1425 fi 1283 fi
1426 export CDROM_ROOTS_${cdcnt}="${!var}"
1427 done 1284 done
1428 export CDROM_ROOT=${CDROM_ROOTS_1} 1285 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1429 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1286 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1287 export CDROM_SET=-1
1288 for f in ${CDROM_CHECK_1//:/ } ; do
1289 ((++CDROM_SET))
1290 [[ -e ${CD_ROOT}/${f} ]] && break
1291 done
1292 export CDROM_MATCH=${f}
1430 return 1293 return
1431 fi 1294 fi
1432 1295
1296 # User didn't help us out so lets make sure they know they can
1297 # simplify the whole process ...
1433 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1298 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1434 einfon "This ebuild will need the " 1299 einfo "This ebuild will need the ${CDROM_NAME:-cdrom for ${PN}}"
1435 if [[ -z ${CDROM_NAME} ]] ; then
1436 echo "cdrom for ${PN}."
1437 else
1438 echo "${CDROM_NAME}."
1439 fi
1440 echo 1300 echo
1441 einfo "If you do not have the CD, but have the data files" 1301 einfo "If you do not have the CD, but have the data files"
1442 einfo "mounted somewhere on your filesystem, just export" 1302 einfo "mounted somewhere on your filesystem, just export"
1443 einfo "the variable CD_ROOT so that it points to the" 1303 einfo "the variable CD_ROOT so that it points to the"
1444 einfo "directory containing the files." 1304 einfo "directory containing the files."
1445 echo 1305 echo
1446 einfo "For example:" 1306 einfo "For example:"
1447 einfo "export CD_ROOT=/mnt/cdrom" 1307 einfo "export CD_ROOT=/mnt/cdrom"
1448 echo 1308 echo
1449 else 1309 else
1310 if [[ -n ${CDROM_NAME_SET} ]] ; then
1311 # Translate the CDROM_NAME_SET array into CDROM_NAME_#
1312 cdcnt=0
1313 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1314 ((++cdcnt))
1315 export CDROM_NAME_${cdcnt}="${CDROM_NAME_SET[$((${cdcnt}-1))]}"
1316 done
1317 fi
1318
1450 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1319 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1451 cdcnt=0 1320 cdcnt=0
1452 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1321 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1453 cdcnt=$((cdcnt + 1)) 1322 ((++cdcnt))
1454 var="CDROM_NAME_${cdcnt}" 1323 var="CDROM_NAME_${cdcnt}"
1455 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}" 1324 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1456 done 1325 done
1457 echo 1326 echo
1458 einfo "If you do not have the CDs, but have the data files" 1327 einfo "If you do not have the CDs, but have the data files"
1459 einfo "mounted somewhere on your filesystem, just export" 1328 einfo "mounted somewhere on your filesystem, just export"
1460 einfo "the following variables so they point to the right place:" 1329 einfo "the following variables so they point to the right place:"
1461 einfon "" 1330 einfon ""
1462 cdcnt=0 1331 cdcnt=0
1463 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1332 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1464 cdcnt=$((cdcnt + 1)) 1333 ((++cdcnt))
1465 echo -n " CD_ROOT_${cdcnt}" 1334 echo -n " CD_ROOT_${cdcnt}"
1466 done 1335 done
1467 echo 1336 echo
1468 einfo "Or, if you have all the files in the same place, or" 1337 einfo "Or, if you have all the files in the same place, or"
1469 einfo "you only have one cdrom, you can export CD_ROOT" 1338 einfo "you only have one cdrom, you can export CD_ROOT"
1472 echo 1341 echo
1473 einfo "For example:" 1342 einfo "For example:"
1474 einfo "export CD_ROOT_1=/mnt/cdrom" 1343 einfo "export CD_ROOT_1=/mnt/cdrom"
1475 echo 1344 echo
1476 fi 1345 fi
1346
1347 export CDROM_SET=""
1477 export CDROM_CURRENT_CD=0 1348 export CDROM_CURRENT_CD=0
1478 cdrom_load_next_cd 1349 cdrom_load_next_cd
1479} 1350}
1480 1351
1481# this is only used when you need access to more than one cd. 1352# this is only used when you need access to more than one cd.
1482# when you have finished using the first cd, just call this function. 1353# when you have finished using the first cd, just call this function.
1483# when it returns, CDROM_ROOT will be pointing to the second cd. 1354# when it returns, CDROM_ROOT will be pointing to the second cd.
1484# remember, you can only go forward in the cd chain, you can't go back. 1355# remember, you can only go forward in the cd chain, you can't go back.
1485cdrom_load_next_cd() { 1356cdrom_load_next_cd() {
1486 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1487 local var= 1357 local var
1488 1358 ((++CDROM_CURRENT_CD))
1489 if [[ ! -z ${CD_ROOT} ]] ; then
1490 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1491 return
1492 fi
1493 1359
1494 unset CDROM_ROOT 1360 unset CDROM_ROOT
1495 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1361 var=CD_ROOT_${CDROM_CURRENT_CD}
1362 [[ -z ${!var} ]] && var="CD_ROOT"
1496 if [[ -z ${!var} ]] ; then 1363 if [[ -z ${!var} ]] ; then
1497 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1364 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1498 cdrom_locate_file_on_cd ${!var} 1365 _cdrom_locate_file_on_cd ${!var}
1499 else 1366 else
1500 export CDROM_ROOT=${!var} 1367 export CDROM_ROOT=${!var}
1501 fi 1368 fi
1502 1369
1503 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1370 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1508# all it does is try to locate a give file on a cd ... if the cd isn't 1375# all it does is try to locate a give file on a cd ... if the cd isn't
1509# found, then a message asking for the user to insert the cdrom will be 1376# found, then a message asking for the user to insert the cdrom will be
1510# displayed and we'll hang out here until: 1377# displayed and we'll hang out here until:
1511# (1) the file is found on a mounted cdrom 1378# (1) the file is found on a mounted cdrom
1512# (2) the user hits CTRL+C 1379# (2) the user hits CTRL+C
1513cdrom_locate_file_on_cd() { 1380_cdrom_locate_file_on_cd() {
1381 local mline=""
1382 local showedmsg=0
1383
1514 while [[ -z ${CDROM_ROOT} ]] ; do 1384 while [[ -z ${CDROM_ROOT} ]] ; do
1385 local i=0
1386 local -a cdset=(${*//:/ })
1387 if [[ -n ${CDROM_SET} ]] ; then
1388 cdset=(${cdset[${CDROM_SET}]})
1389 fi
1390
1391 while [[ -n ${cdset[${i}]} ]] ; do
1515 local dir="$(dirname ${@})" 1392 local dir=$(dirname ${cdset[${i}]})
1516 local file="$(basename ${@})" 1393 local file=$(basename ${cdset[${i}]})
1517 local mline=""
1518 local showedmsg=0
1519 1394
1520 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1395 for mline in $(mount | gawk '/(iso|cdrom|fs=cdfss)/ {print $3}') ; do
1521 [[ -d ${mline}/${dir} ]] || continue 1396 [[ -d ${mline}/${dir} ]] || continue
1522 [[ ! -z $(find ${mline}/${dir} -iname ${file} -maxdepth 1) ]] \ 1397 if [[ -n $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] ; then
1523 && export CDROM_ROOT=${mline} 1398 export CDROM_ROOT=${mline}
1399 export CDROM_SET=${i}
1400 export CDROM_MATCH=${cdset[${i}]}
1401 return
1402 fi
1403 done
1404
1405 ((++i))
1524 done 1406 done
1525 1407
1526 if [[ -z ${CDROM_ROOT} ]] ; then
1527 echo 1408 echo
1528 if [[ ${showedmsg} -eq 0 ]] ; then 1409 if [[ ${showedmsg} -eq 0 ]] ; then
1529 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1410 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1530 if [[ -z ${CDROM_NAME} ]] ; then 1411 if [[ -z ${CDROM_NAME} ]] ; then
1531 einfo "Please insert the cdrom for ${PN} now !" 1412 einfo "Please insert+mount the cdrom for ${PN} now !"
1532 else
1533 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1534 fi
1535 else 1413 else
1536 if [[ -z ${CDROM_NAME_1} ]] ; then
1537 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1538 else
1539 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1540 einfo "Please insert+mount the ${!var} cdrom now !" 1414 einfo "Please insert+mount the ${CDROM_NAME} cdrom now !"
1541 fi
1542 fi 1415 fi
1543 showedmsg=1 1416 else
1417 if [[ -z ${CDROM_NAME_1} ]] ; then
1418 einfo "Please insert+mount cd #${CDROM_CURRENT_CD} for ${PN} now !"
1419 else
1420 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1421 einfo "Please insert+mount the ${!var} cdrom now !"
1422 fi
1544 fi 1423 fi
1424 showedmsg=1
1425 fi
1545 einfo "Press return to scan for the cd again" 1426 einfo "Press return to scan for the cd again"
1546 einfo "or hit CTRL+C to abort the emerge." 1427 einfo "or hit CTRL+C to abort the emerge."
1547 read 1428 echo
1548 fi 1429 einfo "If you are having trouble with the detection"
1430 einfo "of your CD, it is possible that you do not have"
1431 einfo "Joliet support enabled in your kernel. Please"
1432 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1433 read || die "something is screwed with your system"
1549 done 1434 done
1550} 1435}
1551 1436
1552# Make sure that LINGUAS only contains languages that 1437# Make sure that LINGUAS only contains languages that
1553# a package can support 1438# a package can support
1560# The -i builds a list of po files found in all the 1445# The -i builds a list of po files found in all the
1561# directories and uses the intersection of the lists. 1446# directories and uses the intersection of the lists.
1562# The -u builds a list of po files found in all the 1447# The -u builds a list of po files found in all the
1563# directories and uses the union of the lists. 1448# directories and uses the union of the lists.
1564strip-linguas() { 1449strip-linguas() {
1565 local ls newls 1450 local ls newls nols
1566 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then 1451 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1567 local op=$1; shift 1452 local op=$1; shift
1568 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1453 ls=$(find "$1" -name '*.po' -exec basename {} .po \;); shift
1569 local d f 1454 local d f
1570 for d in "$@" ; do 1455 for d in "$@" ; do
1571 if [[ ${op} == "-u" ]] ; then 1456 if [[ ${op} == "-u" ]] ; then
1572 newls=${ls} 1457 newls=${ls}
1573 else 1458 else
1574 newls="" 1459 newls=""
1575 fi 1460 fi
1576 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1461 for f in $(find "$d" -name '*.po' -exec basename {} .po \;) ; do
1577 if [[ ${op} == "-i" ]] ; then 1462 if [[ ${op} == "-i" ]] ; then
1578 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}" 1463 hasq ${f} ${ls} && newls="${newls} ${f}"
1579 else 1464 else
1580 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}" 1465 hasq ${f} ${ls} || newls="${newls} ${f}"
1581 fi 1466 fi
1582 done 1467 done
1583 ls=${newls} 1468 ls=${newls}
1584 done 1469 done
1585 ls=${ls//.po}
1586 else 1470 else
1587 ls=$@ 1471 ls="$@"
1588 fi 1472 fi
1589 1473
1590 ls=" ${ls} " 1474 nols=""
1591 newls="" 1475 newls=""
1592 for f in ${LINGUAS} ; do 1476 for f in ${LINGUAS} ; do
1593 if [[ ${ls/ ${f} /} != ${ls} ]] ; then 1477 if hasq ${f} ${ls} ; then
1594 newls="${newls} ${f}" 1478 newls="${newls} ${f}"
1595 else 1479 else
1596 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1480 nols="${nols} ${f}"
1597 fi 1481 fi
1598 done 1482 done
1599 if [[ -z ${newls} ]] ; then 1483 [[ -n ${nols} ]] \
1600 unset LINGUAS 1484 && ewarn "Sorry, but ${PN} does not support the LINGUAs:" ${nols}
1601 else
1602 export LINGUAS=${newls:1} 1485 export LINGUAS=${newls:1}
1603 fi
1604} 1486}
1605 1487
1606# moved from kernel.eclass since they are generally useful outside of 1488# moved from kernel.eclass since they are generally useful outside of
1607# kernel.eclass -iggy (20041002) 1489# kernel.eclass -iggy (20041002)
1608 1490
1615 while ((i--)) ; do 1497 while ((i--)) ; do
1616 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass" 1498 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1617 done 1499 done
1618 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1500 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1619 case ${ARCH} in 1501 case ${ARCH} in
1620 x86) export ARCH="i386";; 1502 x86) export ARCH="i386";;
1621 amd64) export ARCH="x86_64";; 1503 amd64) export ARCH="x86_64";;
1622 hppa) export ARCH="parisc";; 1504 hppa) export ARCH="parisc";;
1623 mips) export ARCH="mips";; 1505 mips) export ARCH="mips";;
1624 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! 1506 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!
1625 *) export ARCH="${ARCH}";; 1507 *) export ARCH="${ARCH}";;
1626 esac 1508 esac
1627} 1509}
1628 1510
1629# set's ARCH back to what portage expects 1511# set's ARCH back to what portage expects
1630set_arch_to_portage() { 1512set_arch_to_portage() {
1637 1519
1638# Jeremy Huddleston <eradicator@gentoo.org>: 1520# Jeremy Huddleston <eradicator@gentoo.org>:
1639# preserve_old_lib /path/to/libblah.so.0 1521# preserve_old_lib /path/to/libblah.so.0
1640# preserve_old_lib_notify /path/to/libblah.so.0 1522# preserve_old_lib_notify /path/to/libblah.so.0
1641# 1523#
1642# These functions are useful when a lib in your package changes --soname. Such 1524# These functions are useful when a lib in your package changes --library. Such
1643# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0 1525# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0
1644# would break packages that link against it. Most people get around this 1526# would break packages that link against it. Most people get around this
1645# by using the portage SLOT mechanism, but that is not always a relevant 1527# by using the portage SLOT mechanism, but that is not always a relevant
1646# solution, so instead you can add the following to your ebuilds: 1528# solution, so instead you can add the following to your ebuilds:
1647# 1529#
1674 LIB=$1 1556 LIB=$1
1675 1557
1676 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1558 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1677 SONAME=`basename ${LIB}` 1559 SONAME=`basename ${LIB}`
1678 1560
1679 einfo "An old version of an installed library was detected on your system." 1561 ewarn "An old version of an installed library was detected on your system."
1680 einfo "In order to avoid breaking packages that link against is, this older version" 1562 ewarn "In order to avoid breaking packages that link against it, this older version"
1681 einfo "is not being removed. In order to make full use of this newer version," 1563 ewarn "is not being removed. In order to make full use of this newer version,"
1682 einfo "you will need to execute the following command:" 1564 ewarn "you will need to execute the following command:"
1683 einfo " revdep-rebuild --soname ${SONAME}" 1565 ewarn " revdep-rebuild --library ${SONAME}"
1684 einfo 1566 ewarn
1685 einfo "After doing that, you can safely remove ${LIB}" 1567 ewarn "After doing that, you can safely remove ${LIB}"
1686 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1568 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1687 fi 1569 fi
1688} 1570}
1689 1571
1690# Hack for people to figure out if a package was built with 1572# Hack for people to figure out if a package was built with
1691# certain USE flags 1573# certain USE flags
1699built_with_use() { 1581built_with_use() {
1700 local opt=$1 1582 local opt=$1
1701 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1583 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1702 1584
1703 local PKG=$(best_version $1) 1585 local PKG=$(best_version $1)
1586 [[ -z ${PKG} ]] && die "Unable to resolve $1 to an installed package"
1704 shift 1587 shift
1705 1588
1706 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE" 1589 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
1707 [[ ! -e ${USEFILE} ]] && return 1 1590
1591 # if the USE file doesnt exist, assume the $PKG is either
1592 # injected or package.provided
1593 [[ ! -e ${USEFILE} ]] && die "Unable to determine what USE flags $PKG was built with"
1708 1594
1709 local USE_BUILT=$(<${USEFILE}) 1595 local USE_BUILT=$(<${USEFILE})
1710 while [[ $# -gt 0 ]] ; do 1596 while [[ $# -gt 0 ]] ; do
1711 if [[ ${opt} = "-o" ]] ; then 1597 if [[ ${opt} = "-o" ]] ; then
1712 has $1 ${USE_BUILT} && return 0 1598 has $1 ${USE_BUILT} && return 0
1737dopamd() { 1623dopamd() {
1738 [[ -z $1 ]] && die "dopamd requires at least one argument" 1624 [[ -z $1 ]] && die "dopamd requires at least one argument"
1739 1625
1740 use pam || return 0 1626 use pam || return 0
1741 1627
1742 insinto /etc/pam.d 1628 INSDESTTREE=/etc/pam.d \
1743 # these are the default doins options, but be explicit just in case
1744 insopts -m 0644 -o root -g root
1745 doins "$@" || die "failed to install $@" 1629 doins "$@" || die "failed to install $@"
1746} 1630}
1747# newpamd <old name> <new name> 1631# newpamd <old name> <new name>
1748# 1632#
1749# Install pam file <old name> as <new name> in /etc/pam.d 1633# Install pam file <old name> as <new name> in /etc/pam.d
1750newpamd() { 1634newpamd() {
1751 [[ $# -ne 2 ]] && die "newpamd requires two arguements" 1635 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1752 1636
1753 use pam || return 0 1637 use pam || return 0
1754 1638
1755 insinto /etc/pam.d 1639 INSDESTTREE=/etc/pam.d \
1756 # these are the default doins options, but be explicit just in case
1757 insopts -m 0644 -o root -g root
1758 newins "$1" "$2" || die "failed to install $1 as $2" 1640 newins "$1" "$2" || die "failed to install $1 as $2"
1759} 1641}
1642
1643# make a wrapper script ...
1644# NOTE: this was originally games_make_wrapper, but I noticed other places where
1645# this could be used, so I have moved it here and made it not games-specific
1646# -- wolf31o2
1647# $1 == wrapper name
1648# $2 == binary to run
1649# $3 == directory to chdir before running binary
1650# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1651# $5 == path for wrapper
1652make_wrapper() {
1653 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1654 local tmpwrapper=$(emktemp)
1655 # We don't want to quote ${bin} so that people can pass complex
1656 # things as $bin ... "./someprog --args"
1657 cat << EOF > "${tmpwrapper}"
1658#!/bin/sh
1659cd "${chdir:-.}"
1660if [ -n "${libdir}" ] ; then
1661 if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
1662 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1663 else
1664 export LD_LIBRARY_PATH="${libdir}"
1665 fi
1666fi
1667exec ${bin} "\$@"
1668EOF
1669 chmod go+rx "${tmpwrapper}"
1670 if [[ -n ${path} ]] ; then
1671 exeinto "${path}"
1672 newexe "${tmpwrapper}" "${wrapper}"
1673 else
1674 newbin "${tmpwrapper}" "${wrapper}"
1675 fi
1676}

Legend:
Removed from v.1.158  
changed lines
  Added in v.1.247

  ViewVC Help
Powered by ViewVC 1.1.20