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

Diff of /eclass/eutils.eclass

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

Revision 1.157 Revision 1.245
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.157 2005/03/07 17:45:07 carlo Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.245 2006/07/15 19:26:55 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
386 fi 321 fi
387 322
388 if [ "${count}" -eq 5 ] 323 if [ "${count}" -eq 5 ]
389 then 324 then
390 echo 325 echo
391 eerror "Failed Patch: ${patchname}!" 326 eerror "Failed Patch: ${patchname} !"
327 eerror " ( ${PATCH_TARGET} )"
392 eerror 328 eerror
393 eerror "Include in your bugreport the contents of:" 329 eerror "Include in your bugreport the contents of:"
394 eerror 330 eerror
395 eerror " ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}" 331 eerror " ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}"
396 echo 332 echo
406 then 342 then
407 einfo "Done with patching" 343 einfo "Done with patching"
408 fi 344 fi
409} 345}
410 346
411# This function return true if we are using the NPTL pthreads
412# implementation.
413#
414# <azarah@gentoo.org> (06 March 2003)
415#
416have_NPTL() {
417 cat > ${T}/test-nptl.c <<-"END"
418 #define _XOPEN_SOURCE
419 #include <unistd.h>
420 #include <stdio.h>
421
422 int main()
423 {
424 char buf[255];
425 char *str = buf;
426
427 confstr(_CS_GNU_LIBPTHREAD_VERSION, str, 255);
428 if (NULL != str) {
429 printf("%s\n", str);
430 if (NULL != strstr(str, "NPTL"))
431 return 0;
432 }
433
434 return 1;
435 }
436 END
437
438 einfon "Checking for _CS_GNU_LIBPTHREAD_VERSION support in glibc ..."
439 if gcc -o ${T}/nptl ${T}/test-nptl.c &> /dev/null
440 then
441 echo "yes"
442 einfon "Checking what PTHREADS implementation we have ..."
443 if ${T}/nptl
444 then
445 return 0
446 else
447 return 1
448 fi
449 else
450 echo "no"
451 fi
452
453 return 1
454}
455
456# This function check how many cpu's are present, and then set
457# -j in MAKEOPTS accordingly.
458#
459# Thanks to nall <nall@gentoo.org> for this.
460#
461get_number_of_jobs() {
462 local jobs=0
463
464 if [ ! -r /proc/cpuinfo ]
465 then
466 return 1
467 fi
468
469 # This bit is from H?kan Wessberg <nacka-gentoo@refug.org>, bug #13565.
470 if [ "`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | wc -l`" -gt 0 ]
471 then
472 ADMINOPTS="`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | cut -d= -f2 | sed 's/\"//g'`"
473 ADMINPARAM="`echo ${ADMINOPTS} | gawk '{match($0, /-j *[0-9]*/, opt); print opt[0]}'`"
474 ADMINPARAM="${ADMINPARAM/-j}"
475 fi
476
477 export MAKEOPTS="`echo ${MAKEOPTS} | sed -e 's:-j *[0-9]*::g'`"
478
479 if [ "${ARCH}" = "amd64" -o "${ARCH}" = "x86" -o "${ARCH}" = "hppa" -o \
480 "${ARCH}" = "arm" -o "${ARCH}" = "mips" -o "${ARCH}" = "ia64" ]
481 then
482 # these archs will always have "[Pp]rocessor"
483 jobs="$((`grep -c ^[Pp]rocessor /proc/cpuinfo` * 2))"
484
485 elif [ "${ARCH}" = "sparc" -o "${ARCH}" = "sparc64" ]
486 then
487 # sparc always has "ncpus active"
488 jobs="$((`grep "^ncpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
489
490 elif [ "${ARCH}" = "alpha" ]
491 then
492 # alpha has "cpus active", but only when compiled with SMP
493 if [ "`grep -c "^cpus active" /proc/cpuinfo`" -eq 1 ]
494 then
495 jobs="$((`grep "^cpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
496 else
497 jobs=2
498 fi
499
500 elif [ "${ARCH}" = "ppc" -o "${ARCH}" = "ppc64" ]
501 then
502 # ppc has "processor", but only when compiled with SMP
503 if [ "`grep -c "^processor" /proc/cpuinfo`" -eq 1 ]
504 then
505 jobs="$((`grep -c ^processor /proc/cpuinfo` * 2))"
506 else
507 jobs=2
508 fi
509 elif [ "${ARCH}" = "s390" ]
510 then
511 # s390 has "# processors : "
512 jobs="$((`grep "^\# processors" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
513 else
514 jobs="$((`grep -c ^cpu /proc/cpuinfo` * 2))"
515 die "Unknown ARCH -- ${ARCH}!"
516 fi
517
518 # Make sure the number is valid ...
519 if [ "${jobs}" -lt 1 ]
520 then
521 jobs=1
522 fi
523
524 if [ -n "${ADMINPARAM}" ]
525 then
526 if [ "${jobs}" -gt "${ADMINPARAM}" ]
527 then
528 einfo "Setting make jobs to \"-j${ADMINPARAM}\" to ensure successful merge ..."
529 export MAKEOPTS="${MAKEOPTS} -j${ADMINPARAM}"
530 else
531 einfo "Setting make jobs to \"-j${jobs}\" to ensure successful merge ..."
532 export MAKEOPTS="${MAKEOPTS} -j${jobs}"
533 fi
534 fi
535}
536
537# Cheap replacement for when debianutils (and thus mktemp) 347# Cheap replacement for when debianutils (and thus mktemp)
538# does not exist on the users system 348# does not exist on the users system
539# vapier@gentoo.org 349# vapier@gentoo.org
540# 350#
541# Takes just 1 optional parameter (the directory to create tmpfile in) 351# Takes just 1 optional parameter (the directory to create tmpfile in)
542emktemp() { 352emktemp() {
543 local exe="touch" 353 local exe="touch"
544 [ "$1" == "-d" ] && exe="mkdir" && shift 354 [[ $1 == -d ]] && exe="mkdir" && shift
545 local topdir="$1" 355 local topdir=$1
546 356
547 if [ -z "${topdir}" ] 357 if [[ -z ${topdir} ]] ; then
548 then
549 [ -z "${T}" ] \ 358 [[ -z ${T} ]] \
550 && topdir="/tmp" \ 359 && topdir="/tmp" \
551 || topdir="${T}" 360 || topdir=${T}
552 fi 361 fi
553 362
554 if [ -z "$(type -p mktemp)" ] 363 if [[ -z $(type -p mktemp) ]] ; then
555 then
556 local tmp=/ 364 local tmp=/
557 while [ -e "${tmp}" ] ; do 365 while [[ -e ${tmp} ]] ; do
558 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 366 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
559 done 367 done
560 ${exe} "${tmp}" 368 ${exe} "${tmp}" || ${exe} -p "${tmp}"
561 echo "${tmp}" 369 echo "${tmp}"
562 else 370 else
563 [ "${exe}" == "touch" ] \ 371 if [[ ${exe} == "touch" ]] ; then
564 && exe="-p" \ 372 [[ ${USERLAND} == "GNU" ]] \
565 || exe="-d" 373 && mktemp -p "${topdir}" \
566 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
567 fi 380 fi
568} 381}
569 382
570# Small wrapper for getent (Linux), nidump (Mac OS X), 383# Small wrapper for getent (Linux), nidump (Mac OS X),
571# and pw (FreeBSD) used in enewuser()/enewgroup() 384# and pw (FreeBSD) used in enewuser()/enewgroup()
572# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 385# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
573# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 386# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
574# 387#
575# egetent(database, key) 388# egetent(database, key)
576egetent() { 389egetent() {
577 if useq ppc-macos ; then 390 case ${CHOST} in
391 *-darwin*)
578 case "$2" in 392 case "$2" in
579 *[!0-9]*) # Non numeric 393 *[!0-9]*) # Non numeric
580 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 394 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
581 ;; 395 ;;
582 *) # Numeric 396 *) # Numeric
583 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 397 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
584 ;; 398 ;;
585 esac 399 esac
586 elif useq x86-fbsd ; then 400 ;;
587 local action 401 *-freebsd*|*-dragonfly*)
588 if [ "$1" == "passwd" ] 402 local opts action="user"
589 then 403 [[ $1 == "passwd" ]] || action="group"
590 action="user" 404
591 else 405 # lookup by uid/gid
592 action="group" 406 if [[ $2 == [[:digit:]]* ]] ; then
407 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
593 fi 408 fi
409
594 pw show "${action}" "$2" -q 410 pw show ${action} ${opts} "$2" -q
595 else 411 ;;
412 *-netbsd*|*-openbsd*)
413 grep "$2:\*:" /etc/$1
414 ;;
415 *)
596 which nscd >& /dev/null && nscd -i "$1" 416 type -p nscd >& /dev/null && nscd -i "$1"
597 getent "$1" "$2" 417 getent "$1" "$2"
598 fi 418 ;;
419 esac
599} 420}
600 421
601# Simplify/standardize adding users to the system 422# Simplify/standardize adding users to the system
602# vapier@gentoo.org 423# vapier@gentoo.org
603# 424#
610# shell: /bin/false 431# shell: /bin/false
611# homedir: /dev/null 432# homedir: /dev/null
612# groups: none 433# groups: none
613# extra: comment of 'added by portage for ${PN}' 434# extra: comment of 'added by portage for ${PN}'
614enewuser() { 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
615 # get the username 443 # get the username
616 local euser="$1"; shift 444 local euser=$1; shift
617 if [ -z "${euser}" ] 445 if [[ -z ${euser} ]] ; then
618 then
619 eerror "No username specified !" 446 eerror "No username specified !"
620 die "Cannot call enewuser without a username" 447 die "Cannot call enewuser without a username"
621 fi 448 fi
622 449
623 # lets see if the username already exists 450 # lets see if the username already exists
624 if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ] 451 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then
625 then
626 return 0 452 return 0
627 fi 453 fi
628 einfo "Adding user '${euser}' to your system ..." 454 einfo "Adding user '${euser}' to your system ..."
629 455
630 # options to pass to useradd 456 # options to pass to useradd
631 local opts= 457 local opts=
632 458
633 # handle uid 459 # handle uid
634 local euid="$1"; shift 460 local euid=$1; shift
635 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] 461 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then
636 then
637 if [ "${euid}" -gt 0 ] 462 if [[ ${euid} -gt 0 ]] ; then
638 then
639 if [ ! -z "`egetent passwd ${euid}`" ] 463 if [[ ! -z $(egetent passwd ${euid}) ]] ; then
640 then
641 euid="next" 464 euid="next"
642 fi 465 fi
643 else 466 else
644 eerror "Userid given but is not greater than 0 !" 467 eerror "Userid given but is not greater than 0 !"
645 die "${euid} is not a valid UID" 468 die "${euid} is not a valid UID"
646 fi 469 fi
647 else 470 else
648 euid="next" 471 euid="next"
649 fi 472 fi
650 if [ "${euid}" == "next" ] 473 if [[ ${euid} == "next" ]] ; then
651 then 474 for euid in $(seq 101 999) ; do
652 local pwrange
653 if [ "${USERLAND}" == "BSD" ] ; then
654 pwrange="`jot 898 101`"
655 else
656 pwrange="`seq 101 999`"
657 fi
658 for euid in ${pwrange} ; do
659 [ -z "`egetent passwd ${euid}`" ] && break 475 [[ -z $(egetent passwd ${euid}) ]] && break
660 done 476 done
661 fi 477 fi
662 opts="${opts} -u ${euid}" 478 opts="${opts} -u ${euid}"
663 einfo " - Userid: ${euid}" 479 einfo " - Userid: ${euid}"
664 480
665 # handle shell 481 # handle shell
666 local eshell="$1"; shift 482 local eshell=$1; shift
667 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ] 483 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
668 then 484 if [[ ! -e ${ROOT}${eshell} ]] ; then
669 if [ ! -e "${eshell}" ]
670 then
671 eerror "A shell was specified but it does not exist !" 485 eerror "A shell was specified but it does not exist !"
672 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"
673 fi 491 fi
674 else 492 else
675 if [ "${USERLAND}" == "BSD" ] 493 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
676 then 494 [[ -x ${ROOT}${shell} ]] && break
677 eshell="/usr/bin/false" 495 done
678 else 496
679 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"
680 fi 500 fi
501
502 eshell=${shell}
681 fi 503 fi
682 einfo " - Shell: ${eshell}" 504 einfo " - Shell: ${eshell}"
683 opts="${opts} -s ${eshell}" 505 opts="${opts} -s ${eshell}"
684 506
685 # handle homedir 507 # handle homedir
686 local ehome="$1"; shift 508 local ehome=$1; shift
687 if [ -z "${ehome}" ] && [ "${eshell}" != "-1" ] 509 if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then
688 then
689 ehome="/dev/null" 510 ehome="/dev/null"
690 fi 511 fi
691 einfo " - Home: ${ehome}" 512 einfo " - Home: ${ehome}"
692 opts="${opts} -d ${ehome}" 513 opts="${opts} -d ${ehome}"
693 514
694 # handle groups 515 # handle groups
695 local egroups="$1"; shift 516 local egroups=$1; shift
696 if [ ! -z "${egroups}" ] 517 if [[ ! -z ${egroups} ]] ; then
697 then
698 local oldifs="${IFS}" 518 local oldifs=${IFS}
699 local defgroup="" exgroups="" 519 local defgroup="" exgroups=""
700 520
701 export IFS="," 521 export IFS=","
702 for g in ${egroups} 522 for g in ${egroups} ; do
703 do
704 export IFS="${oldifs}" 523 export IFS=${oldifs}
705 if [ -z "`egetent group \"${g}\"`" ] 524 if [[ -z $(egetent group "${g}") ]] ; then
706 then
707 eerror "You must add group ${g} to the system first" 525 eerror "You must add group ${g} to the system first"
708 die "${g} is not a valid GID" 526 die "${g} is not a valid GID"
709 fi 527 fi
710 if [ -z "${defgroup}" ] 528 if [[ -z ${defgroup} ]] ; then
711 then
712 defgroup="${g}" 529 defgroup=${g}
713 else 530 else
714 exgroups="${exgroups},${g}" 531 exgroups="${exgroups},${g}"
715 fi 532 fi
716 export IFS="," 533 export IFS=","
717 done 534 done
718 export IFS="${oldifs}" 535 export IFS=${oldifs}
719 536
720 opts="${opts} -g ${defgroup}" 537 opts="${opts} -g ${defgroup}"
721 if [ ! -z "${exgroups}" ] 538 if [[ ! -z ${exgroups} ]] ; then
722 then
723 opts="${opts} -G ${exgroups:1}" 539 opts="${opts} -G ${exgroups:1}"
724 fi 540 fi
725 else 541 else
726 egroups="(none)" 542 egroups="(none)"
727 fi 543 fi
728 einfo " - Groups: ${egroups}" 544 einfo " - Groups: ${egroups}"
729 545
730 # handle extra and add the user 546 # handle extra and add the user
731 local eextra="$@"
732 local oldsandbox="${SANDBOX_ON}" 547 local oldsandbox=${SANDBOX_ON}
733 export SANDBOX_ON="0" 548 export SANDBOX_ON="0"
734 if useq ppc-macos 549 case ${CHOST} in
735 then 550 *-darwin*)
736 ### Make the user 551 ### Make the user
737 if [ -z "${eextra}" ] 552 if [[ -z $@ ]] ; then
738 then
739 dscl . create /users/${euser} uid ${euid} 553 dscl . create /users/${euser} uid ${euid}
740 dscl . create /users/${euser} shell ${eshell} 554 dscl . create /users/${euser} shell ${eshell}
741 dscl . create /users/${euser} home ${ehome} 555 dscl . create /users/${euser} home ${ehome}
742 dscl . create /users/${euser} realname "added by portage for ${PN}" 556 dscl . create /users/${euser} realname "added by portage for ${PN}"
743 ### Add the user to the groups specified 557 ### Add the user to the groups specified
744 local oldifs="${IFS}" 558 local oldifs=${IFS}
745 export IFS="," 559 export IFS=","
746 for g in ${egroups} 560 for g in ${egroups} ; do
747 do
748 dscl . merge /groups/${g} users ${euser} 561 dscl . merge /groups/${g} users ${euser}
749 done 562 done
750 export IFS="${oldifs}" 563 export IFS=${oldifs}
751 else 564 else
752 einfo "Extra options are not supported on macos yet" 565 einfo "Extra options are not supported on Darwin yet"
753 einfo "Please report the ebuild along with the info below" 566 einfo "Please report the ebuild along with the info below"
754 einfo "eextra: ${eextra}" 567 einfo "eextra: $@"
755 die "Required function missing" 568 die "Required function missing"
756 fi 569 fi
757 elif use x86-fbsd ; then 570 ;;
758 if [ -z "${eextra}" ] 571 *-freebsd*|*-dragonfly*)
759 then 572 if [[ -z $@ ]] ; then
760 pw useradd ${euser} ${opts} \ 573 pw useradd ${euser} ${opts} \
761 -c "added by portage for ${PN}" \ 574 -c "added by portage for ${PN}" \
762 die "enewuser failed" 575 die "enewuser failed"
763 else 576 else
764 einfo " - Extra: ${eextra}" 577 einfo " - Extra: $@"
765 pw useradd ${euser} ${opts} \ 578 pw useradd ${euser} ${opts} \
766 -c ${eextra} || die "enewuser failed" 579 "$@" || die "enewuser failed"
767 fi 580 fi
581 ;;
582
583 *-netbsd*)
584 if [[ -z $@ ]] ; then
585 useradd ${opts} ${euser} || die "enewuser failed"
768 else 586 else
769 if [ -z "${eextra}" ] 587 einfo " - Extra: $@"
770 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
771 useradd ${opts} ${euser} \ 607 useradd ${opts} ${euser} \
772 -c "added by portage for ${PN}" \ 608 -c "added by portage for ${PN}" \
773 || die "enewuser failed" 609 || die "enewuser failed"
774 else 610 else
775 einfo " - Extra: ${eextra}" 611 einfo " - Extra: $@"
776 useradd ${opts} ${euser} ${eextra} \ 612 useradd ${opts} ${euser} "$@" \
777 || die "enewuser failed" 613 || die "enewuser failed"
778 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}"
779 fi 623 fi
624
780 export SANDBOX_ON="${oldsandbox}" 625 export SANDBOX_ON=${oldsandbox}
781
782 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ]
783 then
784 einfo " - Creating ${ehome} in ${D}"
785 dodir ${ehome}
786 fowners ${euser} ${ehome}
787 fperms 755 ${ehome}
788 fi
789} 626}
790 627
791# Simplify/standardize adding groups to the system 628# Simplify/standardize adding groups to the system
792# vapier@gentoo.org 629# vapier@gentoo.org
793# 630#
796# Default values if you do not specify any: 633# Default values if you do not specify any:
797# groupname: REQUIRED ! 634# groupname: REQUIRED !
798# gid: next available (see groupadd(8)) 635# gid: next available (see groupadd(8))
799# extra: none 636# extra: none
800enewgroup() { 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
801 # get the group 645 # get the group
802 local egroup="$1"; shift 646 local egroup="$1"; shift
803 if [ -z "${egroup}" ] 647 if [ -z "${egroup}" ]
804 then 648 then
805 eerror "No group specified !" 649 eerror "No group specified !"
822 then 666 then
823 if [ "${egid}" -gt 0 ] 667 if [ "${egid}" -gt 0 ]
824 then 668 then
825 if [ -z "`egetent group ${egid}`" ] 669 if [ -z "`egetent group ${egid}`" ]
826 then 670 then
827 if useq ppc-macos ; then 671 if [[ "${CHOST}" == *-darwin* ]]; then
828 opts="${opts} ${egid}" 672 opts="${opts} ${egid}"
829 else 673 else
830 opts="${opts} -g ${egid}" 674 opts="${opts} -g ${egid}"
831 fi 675 fi
832 else 676 else
846 opts="${opts} ${eextra}" 690 opts="${opts} ${eextra}"
847 691
848 # add the group 692 # add the group
849 local oldsandbox="${SANDBOX_ON}" 693 local oldsandbox="${SANDBOX_ON}"
850 export SANDBOX_ON="0" 694 export SANDBOX_ON="0"
851 if useq ppc-macos ; then 695 case ${CHOST} in
696 *-darwin*)
852 if [ ! -z "${eextra}" ]; 697 if [ ! -z "${eextra}" ];
853 then 698 then
854 einfo "Extra options are not supported on macos yet" 699 einfo "Extra options are not supported on Darwin/OS X yet"
855 einfo "Please report the ebuild along with the info below" 700 einfo "Please report the ebuild along with the info below"
856 einfo "eextra: ${eextra}" 701 einfo "eextra: ${eextra}"
857 die "Required function missing" 702 die "Required function missing"
858 fi 703 fi
859 704
860 # If we need the next available 705 # If we need the next available
861 case ${egid} in 706 case ${egid} in
862 *[!0-9]*) # Non numeric 707 *[!0-9]*) # Non numeric
863 for egid in `jot 898 101`; do 708 for egid in $(seq 101 999); do
864 [ -z "`egetent group ${egid}`" ] && break 709 [ -z "`egetent group ${egid}`" ] && break
865 done 710 done
866 esac 711 esac
867 dscl . create /groups/${egroup} gid ${egid} 712 dscl . create /groups/${egroup} gid ${egid}
868 dscl . create /groups/${egroup} passwd '*' 713 dscl . create /groups/${egroup} passwd '*'
869 elif use x86-fbsd ; then 714 ;;
715
716 *-freebsd*|*-dragonfly*)
870 case ${egid} in 717 case ${egid} in
871 *[!0-9]*) # Non numeric 718 *[!0-9]*) # Non numeric
872 for egid in `jot 898 101`; do 719 for egid in $(seq 101 999); do
873 [ -z "`egetent group ${egid}`" ] && break 720 [ -z "`egetent group ${egid}`" ] && break
874 done 721 done
875 esac 722 esac
876 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 723 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
877 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 *)
878 groupadd ${opts} ${egroup} || die "enewgroup failed" 737 groupadd ${opts} ${egroup} || die "enewgroup failed"
879 fi 738 ;;
739 esac
880 export SANDBOX_ON="${oldsandbox}" 740 export SANDBOX_ON="${oldsandbox}"
881} 741}
882 742
883# Simple script to replace 'dos2unix' binaries 743# Simple script to replace 'dos2unix' binaries
884# vapier@gentoo.org 744# vapier@gentoo.org
901 761
902# Make a desktop file ! 762# Make a desktop file !
903# Great for making those icons in kde/gnome startmenu ! 763# Great for making those icons in kde/gnome startmenu !
904# Amaze your friends ! Get the women ! Join today ! 764# Amaze your friends ! Get the women ! Join today !
905# 765#
906# make_desktop_entry(<binary>, [name], [icon], [type], [path]) 766# make_desktop_entry(<command>, [name], [icon], [type], [path])
907# 767#
908# binary: what binary does the app run with ? 768# binary: what command does the app run with ?
909# name: the name that will show up in the menu 769# name: the name that will show up in the menu
910# icon: give your little like a pretty little icon ... 770# icon: give your little like a pretty little icon ...
911# this can be relative (to /usr/share/pixmaps) or 771# this can be relative (to /usr/share/pixmaps) or
912# a full path to an icon 772# a full path to an icon
913# type: what kind of application is this ? for categories: 773# type: what kind of application is this ? for categories:
914# http://www.freedesktop.org/wiki/Standards_2fmenu_2dspec 774# http://www.freedesktop.org/Standards/desktop-entry-spec
915# path: if your app needs to startup in a specific dir 775# path: if your app needs to startup in a specific dir
916make_desktop_entry() { 776make_desktop_entry() {
917 [ -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
918 778
919 local exec="${1}" 779 local exec=${1}
920 local name="${2:-${PN}}" 780 local name=${2:-${PN}}
921 local icon="${3:-${PN}.png}" 781 local icon=${3:-${PN}.png}
922 local type="${4}" 782 local type=${4}
923 local subdir="${6}" 783 local path=${5}
924 local path="${5:-${GAMES_BINDIR}}" 784
925 if [ -z "${type}" ] 785 if [[ -z ${type} ]] ; then
926 then 786 local catmaj=${CATEGORY%%-*}
927 case ${CATEGORY} in 787 local catmin=${CATEGORY##*-}
928 "app-emulation") 788 case ${catmaj} in
929 type=Emulator 789 app)
930 subdir="Emulation" 790 case ${catmin} in
791 admin) type=System;;
792 cdr) type=DiscBurning;;
793 dicts) type=Dictionary;;
794 editors) type=TextEditor;;
795 emacs) type=TextEditor;;
796 emulation) type=Emulator;;
797 laptop) type=HardwareSettings;;
798 office) type=Office;;
799 vim) type=TextEditor;;
800 xemacs) type=TextEditor;;
801 *) type=;;
802 esac
931 ;; 803 ;;
932 "games-"*) 804
933 type=Game 805 dev)
934 subdir="Games" 806 type="Development"
935 ;; 807 ;;
936 "net-"*) 808
937 type=Network 809 games)
938 subdir="${type}" 810 case ${catmin} in
811 action) type=ActionGame;;
812 arcade) type=ArcadeGame;;
813 board) type=BoardGame;;
814 kid) type=KidsGame;;
815 emulation) type=Emulator;;
816 puzzle) type=LogicGame;;
817 rpg) type=RolePlaying;;
818 roguelike) type=RolePlaying;;
819 simulation) type=Simulation;;
820 sports) type=SportsGame;;
821 strategy) type=StrategyGame;;
822 *) type=;;
823 esac
824 type="Game;${type}"
939 ;; 825 ;;
826
827 mail)
828 type="Network;Email"
829 ;;
830
831 media)
832 case ${catmin} in
833 gfx) type=Graphics;;
834 radio) type=Tuner;;
835 sound) type=Audio;;
836 tv) type=TV;;
837 video) type=Video;;
838 *) type=;;
839 esac
840 type="AudioVideo;${type}"
841 ;;
842
843 net)
844 case ${catmin} in
845 dialup) type=Dialup;;
846 ftp) type=FileTransfer;;
847 im) type=InstantMessaging;;
848 irc) type=IRCClient;;
849 mail) type=Email;;
850 news) type=News;;
851 nntp) type=News;;
852 p2p) type=FileTransfer;;
853 *) type=;;
854 esac
855 type="Network;${type}"
856 ;;
857
858 sci)
859 case ${catmin} in
860 astro*) type=Astronomy;;
861 bio*) type=Biology;;
862 calc*) type=Calculator;;
863 chem*) type=Chemistry;;
864 geo*) type=Geology;;
865 math*) type=Math;;
866 *) type=;;
867 esac
868 type="Science;${type}"
869 ;;
870
871 www)
872 case ${catmin} in
873 client) type=WebBrowser;;
874 *) type=;;
875 esac
876 type="Network"
877 ;;
878
940 *) 879 *)
941 type= 880 type=
942 subdir=
943 ;; 881 ;;
944 esac 882 esac
945 fi 883 fi
884 if [ "${SLOT}" == "0" ] ; then
885 local desktop_name="${PN}"
886 else
887 local desktop_name="${PN}-${SLOT}"
888 fi
946 local desktop="${T}/${exec%% *}-${P}.desktop" 889 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
890# local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
947 891
948echo "[Desktop Entry] 892echo "[Desktop Entry]
949Encoding=UTF-8 893Encoding=UTF-8
950Version=0.9.2 894Version=0.9.2
951Name=${name} 895Name=${name}
952Type=Application 896Type=Application
953Comment=${DESCRIPTION} 897Comment=${DESCRIPTION}
954Exec=${exec} 898Exec=${exec}
899TryExec=${exec%% *}
955Path=${path} 900Path=${path}
956Icon=${icon} 901Icon=${icon}
957Categories=Application;${type};" > "${desktop}" 902Categories=Application;${type};" > "${desktop}"
958 903
904 (
905 # wrap the env here so that the 'insinto' call
906 # doesn't corrupt the env of the caller
959 insinto /usr/share/applications 907 insinto /usr/share/applications
960 doins "${desktop}" 908 doins "${desktop}"
961 909 )
962 return 0
963} 910}
964 911
965# Make a GDM/KDM Session file 912# Make a GDM/KDM Session file
966# 913#
967# make_desktop_entry(<title>, <command>) 914# make_desktop_entry(<title>, <command>)
968# title: File to execute to start the Window Manager 915# title: File to execute to start the Window Manager
969# command: Name of the Window Manager 916# command: Name of the Window Manager
970 917
971make_session_desktop() { 918make_session_desktop() {
972
973 [ -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
974 [ -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
975 921
976 local title="${1}" 922 local title=$1
977 local command="${2}" 923 local command=$2
978 local desktop="${T}/${wm}.desktop" 924 local desktop=${T}/${wm}.desktop
979 925
980echo "[Desktop Entry] 926echo "[Desktop Entry]
981Encoding=UTF-8 927Encoding=UTF-8
982Name=${title} 928Name=${title}
983Comment=This session logs you into ${title} 929Comment=This session logs you into ${title}
985TryExec=${command} 931TryExec=${command}
986Type=Application" > "${desktop}" 932Type=Application" > "${desktop}"
987 933
988 insinto /usr/share/xsessions 934 insinto /usr/share/xsessions
989 doins "${desktop}" 935 doins "${desktop}"
990
991 return 0
992} 936}
993 937
994domenu() { 938domenu() {
995 local i 939 local i j
996 local j
997 insinto /usr/share/applications 940 insinto /usr/share/applications
998 for i in ${@} 941 for i in "$@" ; do
999 do
1000 if [ -f "${i}" ]; 942 if [[ -f ${i} ]] ; then
1001 then
1002 doins ${i} 943 doins "${i}"
1003 elif [ -d "${i}" ]; 944 elif [[ -d ${i} ]] ; then
1004 then
1005 for j in ${i}/*.desktop 945 for j in "${i}"/*.desktop ; do
1006 do
1007 doins ${j} 946 doins "${j}"
1008 done 947 done
1009 fi 948 fi
1010 done 949 done
1011} 950}
951newmenu() {
952 insinto /usr/share/applications
953 newins "$1" "$2"
954}
1012 955
1013doicon() { 956doicon() {
1014 local i 957 local i j
1015 local j
1016 insinto /usr/share/pixmaps 958 insinto /usr/share/pixmaps
1017 for i in ${@} 959 for i in "$@" ; do
1018 do
1019 if [ -f "${i}" ]; 960 if [[ -f ${i} ]] ; then
1020 then
1021 doins ${i} 961 doins "${i}"
1022 elif [ -d "${i}" ]; 962 elif [[ -d ${i} ]] ; then
1023 then
1024 for j in ${i}/*.png 963 for j in "${i}"/*.png ; do
1025 do
1026 doins ${j} 964 doins "${j}"
1027 done 965 done
1028 fi 966 fi
1029 done 967 done
968}
969newicon() {
970 insinto /usr/share/pixmaps
971 newins "$1" "$2"
1030} 972}
1031 973
1032############################################################## 974##############################################################
1033# END: Handle .desktop files and menu entries # 975# END: Handle .desktop files and menu entries #
1034############################################################## 976##############################################################
1035 977
1036 978
1037# for internal use only (unpack_pdv and unpack_makeself) 979# for internal use only (unpack_pdv and unpack_makeself)
1038find_unpackable_file() { 980find_unpackable_file() {
1039 local src="$1" 981 local src=$1
1040 if [ -z "${src}" ] 982 if [[ -z ${src} ]] ; then
1041 then
1042 src="${DISTDIR}/${A}" 983 src=${DISTDIR}/${A}
1043 else 984 else
1044 if [ -e "${DISTDIR}/${src}" ] 985 if [[ -e ${DISTDIR}/${src} ]] ; then
1045 then
1046 src="${DISTDIR}/${src}" 986 src=${DISTDIR}/${src}
1047 elif [ -e "${PWD}/${src}" ] 987 elif [[ -e ${PWD}/${src} ]] ; then
1048 then
1049 src="${PWD}/${src}" 988 src=${PWD}/${src}
1050 elif [ -e "${src}" ] 989 elif [[ -e ${src} ]] ; then
1051 then
1052 src="${src}" 990 src=${src}
1053 fi
1054 fi 991 fi
1055 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 992 fi
993 [[ ! -e ${src} ]] && return 1
1056 echo "${src}" 994 echo "${src}"
1057} 995}
1058 996
1059# Unpack those pesky pdv generated files ... 997# Unpack those pesky pdv generated files ...
1060# They're self-unpacking programs with the binary package stuffed in 998# They're self-unpacking programs with the binary package stuffed in
1075# lseek 1013# lseek
1076# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1014# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
1077# lseek(3, -4, SEEK_END) = 2981250 1015# lseek(3, -4, SEEK_END) = 2981250
1078# 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.
1079unpack_pdv() { 1017unpack_pdv() {
1080 local src="`find_unpackable_file $1`" 1018 local src=$(find_unpackable_file $1)
1081 local sizeoff_t="$2" 1019 local sizeoff_t=$2
1082 1020
1021 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1083 [ -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 :("
1084 1023
1085 local shrtsrc="`basename ${src}`" 1024 local shrtsrc=$(basename "${src}")
1086 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1025 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1087 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1026 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
1088 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\"`
1089 1028
1090 # grab metadata for debug reasons 1029 # grab metadata for debug reasons
1154# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1093# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1155# - If the file is not specified then unpack will utilize ${A}. 1094# - If the file is not specified then unpack will utilize ${A}.
1156# - 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
1157# the proper offset from the script itself. 1096# the proper offset from the script itself.
1158unpack_makeself() { 1097unpack_makeself() {
1098 local src_input=${1:-${A}}
1159 local src="$(find_unpackable_file "$1")" 1099 local src=$(find_unpackable_file "${src_input}")
1160 local skip="$2" 1100 local skip=$2
1161 local exe="$3" 1101 local exe=$3
1162 1102
1103 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1104
1163 local shrtsrc="$(basename "${src}")" 1105 local shrtsrc=$(basename "${src}")
1164 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1106 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1165 if [ -z "${skip}" ] 1107 if [[ -z ${skip} ]] ; then
1166 then
1167 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1108 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1168 local skip=0 1109 local skip=0
1169 exe=tail 1110 exe=tail
1170 case ${ver} in 1111 case ${ver} in
1171 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
1172 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1113 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1173 ;; 1114 ;;
1174 2.0|2.0.1) 1115 2.0|2.0.1)
1175 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-) 1116 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-)
1176 ;; 1117 ;;
1184 ;; 1125 ;;
1185 2.1.3) 1126 2.1.3)
1186 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1127 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1187 let skip="skip + 1" 1128 let skip="skip + 1"
1188 ;; 1129 ;;
1189 2.1.4) 1130 2.1.4|2.1.5)
1190 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)
1191 skip=$(head -n ${skip} "${src}" | wc -c) 1132 skip=$(head -n ${skip} "${src}" | wc -c)
1192 exe="dd" 1133 exe="dd"
1193 ;; 1134 ;;
1194 *) 1135 *)
1239check_license() { 1180check_license() {
1240 local lic=$1 1181 local lic=$1
1241 if [ -z "${lic}" ] ; then 1182 if [ -z "${lic}" ] ; then
1242 lic="${PORTDIR}/licenses/${LICENSE}" 1183 lic="${PORTDIR}/licenses/${LICENSE}"
1243 else 1184 else
1244 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1185 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1245 lic="${PORTDIR}/licenses/${src}" 1186 lic="${PORTDIR}/licenses/${lic}"
1246 elif [ -e "${PWD}/${src}" ] ; then 1187 elif [ -e "${PWD}/${lic}" ] ; then
1247 lic="${PWD}/${src}" 1188 lic="${PWD}/${lic}"
1248 elif [ -e "${src}" ] ; then 1189 elif [ -e "${lic}" ] ; then
1249 lic="${src}" 1190 lic="${lic}"
1250 fi
1251 fi 1191 fi
1192 fi
1252 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1193 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1253 local l="`basename ${lic}`" 1194 local l="`basename ${lic}`"
1254 1195
1255 # here is where we check for the licenses the user already 1196 # here is where we check for the licenses the user already
1256 # 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
1257 local shopts=$- 1198 local shopts=$-
1299# 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
1300# found at CDROM_ROOT. 1241# found at CDROM_ROOT.
1301# 1242#
1302# 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',
1303# 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
1304# 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_#
1305# 1250#
1306# 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.
1307# 1252#
1308# 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] [...]
1309# - 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
1313 # 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
1314 # the # of files they gave us 1259 # the # of files they gave us
1315 local cdcnt=0 1260 local cdcnt=0
1316 local f= 1261 local f=
1317 for f in "$@" ; do 1262 for f in "$@" ; do
1318 cdcnt=$((cdcnt + 1)) 1263 ((++cdcnt))
1319 export CDROM_CHECK_${cdcnt}="$f" 1264 export CDROM_CHECK_${cdcnt}="$f"
1320 done 1265 done
1321 export CDROM_TOTAL_CDS=${cdcnt} 1266 export CDROM_TOTAL_CDS=${cdcnt}
1322 export CDROM_CURRENT_CD=1 1267 export CDROM_CURRENT_CD=1
1323 1268
1324 # now we see if the user gave use CD_ROOT ... 1269 # now we see if the user gave use CD_ROOT ...
1325 # 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
1326 if [[ ! -z ${CD_ROOT} ]] ; then
1327 export CDROM_ROOT=${CD_ROOT}
1328 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1329 return
1330 fi
1331 # do the same for CD_ROOT_X
1332 if [[ ! -z ${CD_ROOT_1} ]] ; then 1271 if [[ -n ${CD_ROOT}${CD_ROOT_1} ]] ; then
1333 local var= 1272 local var=
1334 cdcnt=0 1273 cdcnt=0
1335 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1274 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1336 cdcnt=$((cdcnt + 1)) 1275 ((++cdcnt))
1337 var="CD_ROOT_${cdcnt}" 1276 var="CD_ROOT_${cdcnt}"
1277 [[ -z ${!var} ]] && var="CD_ROOT"
1338 if [[ -z ${!var} ]] ; then 1278 if [[ -z ${!var} ]] ; then
1339 eerror "You must either use just the CD_ROOT" 1279 eerror "You must either use just the CD_ROOT"
1340 eerror "or specify ALL the CD_ROOT_X variables." 1280 eerror "or specify ALL the CD_ROOT_X variables."
1341 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."
1342 die "could not locate CD_ROOT_${cdcnt}" 1282 die "could not locate CD_ROOT_${cdcnt}"
1343 fi 1283 fi
1344 export CDROM_ROOTS_${cdcnt}="${!var}"
1345 done 1284 done
1346 export CDROM_ROOT=${CDROM_ROOTS_1} 1285 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1347 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}
1348 return 1293 return
1349 fi 1294 fi
1350 1295
1296 # User didn't help us out so lets make sure they know they can
1297 # simplify the whole process ...
1351 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1298 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1352 einfon "This ebuild will need the " 1299 einfo "This ebuild will need the ${CDROM_NAME:-cdrom for ${PN}}"
1353 if [[ -z ${CDROM_NAME} ]] ; then
1354 echo "cdrom for ${PN}."
1355 else
1356 echo "${CDROM_NAME}."
1357 fi
1358 echo 1300 echo
1359 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"
1360 einfo "mounted somewhere on your filesystem, just export" 1302 einfo "mounted somewhere on your filesystem, just export"
1361 einfo "the variable CD_ROOT so that it points to the" 1303 einfo "the variable CD_ROOT so that it points to the"
1362 einfo "directory containing the files." 1304 einfo "directory containing the files."
1363 echo 1305 echo
1364 einfo "For example:" 1306 einfo "For example:"
1365 einfo "export CD_ROOT=/mnt/cdrom" 1307 einfo "export CD_ROOT=/mnt/cdrom"
1366 echo 1308 echo
1367 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
1368 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1319 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1369 cdcnt=0 1320 cdcnt=0
1370 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1321 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1371 cdcnt=$((cdcnt + 1)) 1322 ((++cdcnt))
1372 var="CDROM_NAME_${cdcnt}" 1323 var="CDROM_NAME_${cdcnt}"
1373 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}" 1324 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1374 done 1325 done
1375 echo 1326 echo
1376 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"
1377 einfo "mounted somewhere on your filesystem, just export" 1328 einfo "mounted somewhere on your filesystem, just export"
1378 einfo "the following variables so they point to the right place:" 1329 einfo "the following variables so they point to the right place:"
1379 einfon "" 1330 einfon ""
1380 cdcnt=0 1331 cdcnt=0
1381 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1332 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1382 cdcnt=$((cdcnt + 1)) 1333 ((++cdcnt))
1383 echo -n " CD_ROOT_${cdcnt}" 1334 echo -n " CD_ROOT_${cdcnt}"
1384 done 1335 done
1385 echo 1336 echo
1386 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"
1387 einfo "you only have one cdrom, you can export CD_ROOT" 1338 einfo "you only have one cdrom, you can export CD_ROOT"
1390 echo 1341 echo
1391 einfo "For example:" 1342 einfo "For example:"
1392 einfo "export CD_ROOT_1=/mnt/cdrom" 1343 einfo "export CD_ROOT_1=/mnt/cdrom"
1393 echo 1344 echo
1394 fi 1345 fi
1346
1347 export CDROM_SET=""
1395 export CDROM_CURRENT_CD=0 1348 export CDROM_CURRENT_CD=0
1396 cdrom_load_next_cd 1349 cdrom_load_next_cd
1397} 1350}
1398 1351
1399# 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.
1400# 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.
1401# 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.
1402# 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.
1403cdrom_load_next_cd() { 1356cdrom_load_next_cd() {
1404 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1405 local var= 1357 local var
1406 1358 ((++CDROM_CURRENT_CD))
1407 if [[ ! -z ${CD_ROOT} ]] ; then
1408 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1409 return
1410 fi
1411 1359
1412 unset CDROM_ROOT 1360 unset CDROM_ROOT
1413 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1361 var=CD_ROOT_${CDROM_CURRENT_CD}
1362 [[ -z ${!var} ]] && var="CD_ROOT"
1414 if [[ -z ${!var} ]] ; then 1363 if [[ -z ${!var} ]] ; then
1415 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1364 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1416 cdrom_locate_file_on_cd ${!var} 1365 _cdrom_locate_file_on_cd ${!var}
1417 else 1366 else
1418 export CDROM_ROOT=${!var} 1367 export CDROM_ROOT=${!var}
1419 fi 1368 fi
1420 1369
1421 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1370 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1426# 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
1427# 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
1428# displayed and we'll hang out here until: 1377# displayed and we'll hang out here until:
1429# (1) the file is found on a mounted cdrom 1378# (1) the file is found on a mounted cdrom
1430# (2) the user hits CTRL+C 1379# (2) the user hits CTRL+C
1431cdrom_locate_file_on_cd() { 1380_cdrom_locate_file_on_cd() {
1381 local mline=""
1382 local showedmsg=0
1383
1432 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
1433 local dir="$(dirname ${@})" 1392 local dir=$(dirname ${cdset[${i}]})
1434 local file="$(basename ${@})" 1393 local file=$(basename ${cdset[${i}]})
1435 local mline=""
1436 local showedmsg=0
1437 1394
1438 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
1439 [[ -d ${mline}/${dir} ]] || continue 1396 [[ -d ${mline}/${dir} ]] || continue
1440 [[ ! -z $(find ${mline}/${dir} -iname ${file} -maxdepth 1) ]] \ 1397 if [[ -n $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] ; then
1441 && 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))
1442 done 1406 done
1443 1407
1444 if [[ -z ${CDROM_ROOT} ]] ; then
1445 echo 1408 echo
1446 if [[ ${showedmsg} -eq 0 ]] ; then 1409 if [[ ${showedmsg} -eq 0 ]] ; then
1447 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1410 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1448 if [[ -z ${CDROM_NAME} ]] ; then 1411 if [[ -z ${CDROM_NAME} ]] ; then
1449 einfo "Please insert the cdrom for ${PN} now !" 1412 einfo "Please insert+mount the cdrom for ${PN} now !"
1450 else
1451 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1452 fi
1453 else 1413 else
1454 if [[ -z ${CDROM_NAME_1} ]] ; then
1455 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1456 else
1457 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1458 einfo "Please insert+mount the ${!var} cdrom now !" 1414 einfo "Please insert+mount the ${CDROM_NAME} cdrom now !"
1459 fi
1460 fi 1415 fi
1461 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
1462 fi 1423 fi
1424 showedmsg=1
1425 fi
1463 einfo "Press return to scan for the cd again" 1426 einfo "Press return to scan for the cd again"
1464 einfo "or hit CTRL+C to abort the emerge." 1427 einfo "or hit CTRL+C to abort the emerge."
1465 read 1428 echo
1466 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"
1467 done 1434 done
1468} 1435}
1469 1436
1470# Make sure that LINGUAS only contains languages that 1437# Make sure that LINGUAS only contains languages that
1471# a package can support 1438# a package can support
1478# 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
1479# directories and uses the intersection of the lists. 1446# directories and uses the intersection of the lists.
1480# 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
1481# directories and uses the union of the lists. 1448# directories and uses the union of the lists.
1482strip-linguas() { 1449strip-linguas() {
1483 local ls newls 1450 local ls newls nols
1484 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then 1451 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1485 local op=$1; shift 1452 local op=$1; shift
1486 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1453 ls=$(find "$1" -name '*.po' -exec basename {} .po \;); shift
1487 local d f 1454 local d f
1488 for d in "$@" ; do 1455 for d in "$@" ; do
1489 if [[ ${op} == "-u" ]] ; then 1456 if [[ ${op} == "-u" ]] ; then
1490 newls=${ls} 1457 newls=${ls}
1491 else 1458 else
1492 newls="" 1459 newls=""
1493 fi 1460 fi
1494 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1461 for f in $(find "$d" -name '*.po' -exec basename {} .po \;) ; do
1495 if [[ ${op} == "-i" ]] ; then 1462 if [[ ${op} == "-i" ]] ; then
1496 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}" 1463 hasq ${f} ${ls} && newls="${newls} ${f}"
1497 else 1464 else
1498 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}" 1465 hasq ${f} ${ls} || newls="${newls} ${f}"
1499 fi 1466 fi
1500 done 1467 done
1501 ls=${newls} 1468 ls=${newls}
1502 done 1469 done
1503 ls=${ls//.po}
1504 else 1470 else
1505 ls=$@ 1471 ls="$@"
1506 fi 1472 fi
1507 1473
1508 ls=" ${ls} " 1474 nols=""
1509 newls="" 1475 newls=""
1510 for f in ${LINGUAS} ; do 1476 for f in ${LINGUAS} ; do
1511 if [[ ${ls/ ${f} /} != ${ls} ]] ; then 1477 if hasq ${f} ${ls} ; then
1512 newls="${newls} ${f}" 1478 newls="${newls} ${f}"
1513 else 1479 else
1514 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1480 nols="${nols} ${f}"
1515 fi 1481 fi
1516 done 1482 done
1517 if [[ -z ${newls} ]] ; then 1483 [[ -n ${nols} ]] \
1518 unset LINGUAS 1484 && ewarn "Sorry, but ${PN} does not support the LINGUAs:" ${nols}
1519 else
1520 export LINGUAS=${newls:1} 1485 export LINGUAS=${newls:1}
1521 fi
1522} 1486}
1523 1487
1524# moved from kernel.eclass since they are generally useful outside of 1488# moved from kernel.eclass since they are generally useful outside of
1525# kernel.eclass -iggy (20041002) 1489# kernel.eclass -iggy (20041002)
1526 1490
1533 while ((i--)) ; do 1497 while ((i--)) ; do
1534 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass" 1498 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1535 done 1499 done
1536 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1500 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1537 case ${ARCH} in 1501 case ${ARCH} in
1538 x86) export ARCH="i386";; 1502 x86) export ARCH="i386";;
1539 amd64) export ARCH="x86_64";; 1503 amd64) export ARCH="x86_64";;
1540 hppa) export ARCH="parisc";; 1504 hppa) export ARCH="parisc";;
1541 mips) export ARCH="mips";; 1505 mips) export ARCH="mips";;
1542 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!
1543 *) export ARCH="${ARCH}";; 1507 *) export ARCH="${ARCH}";;
1544 esac 1508 esac
1545} 1509}
1546 1510
1547# set's ARCH back to what portage expects 1511# set's ARCH back to what portage expects
1548set_arch_to_portage() { 1512set_arch_to_portage() {
1555 1519
1556# Jeremy Huddleston <eradicator@gentoo.org>: 1520# Jeremy Huddleston <eradicator@gentoo.org>:
1557# preserve_old_lib /path/to/libblah.so.0 1521# preserve_old_lib /path/to/libblah.so.0
1558# preserve_old_lib_notify /path/to/libblah.so.0 1522# preserve_old_lib_notify /path/to/libblah.so.0
1559# 1523#
1560# 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
1561# 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
1562# 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
1563# 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
1564# solution, so instead you can add the following to your ebuilds: 1528# solution, so instead you can add the following to your ebuilds:
1565# 1529#
1592 LIB=$1 1556 LIB=$1
1593 1557
1594 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1558 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1595 SONAME=`basename ${LIB}` 1559 SONAME=`basename ${LIB}`
1596 1560
1597 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."
1598 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"
1599 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,"
1600 einfo "you will need to execute the following command:" 1564 ewarn "you will need to execute the following command:"
1601 einfo " revdep-rebuild --soname ${SONAME}" 1565 ewarn " revdep-rebuild --library ${SONAME}"
1602 einfo 1566 ewarn
1603 einfo "After doing that, you can safely remove ${LIB}" 1567 ewarn "After doing that, you can safely remove ${LIB}"
1604 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1568 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1605 fi 1569 fi
1606} 1570}
1607 1571
1608# 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
1609# certain USE flags 1573# certain USE flags
1619 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1583 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1620 1584
1621 local PKG=$(best_version $1) 1585 local PKG=$(best_version $1)
1622 shift 1586 shift
1623 1587
1624 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE" 1588 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
1589
1590 # if the USE file doesnt exist, assume the $PKG is either
1591 # injected or package.provided
1625 [[ ! -e ${USEFILE} ]] && return 1 1592 [[ ! -e ${USEFILE} ]] && return 0
1626 1593
1627 local USE_BUILT=$(<${USEFILE}) 1594 local USE_BUILT=$(<${USEFILE})
1628 while [[ $# -gt 0 ]] ; do 1595 while [[ $# -gt 0 ]] ; do
1629 if [[ ${opt} = "-o" ]] ; then 1596 if [[ ${opt} = "-o" ]] ; then
1630 has $1 ${USE_BUILT} && return 0 1597 has $1 ${USE_BUILT} && return 0
1655dopamd() { 1622dopamd() {
1656 [[ -z $1 ]] && die "dopamd requires at least one argument" 1623 [[ -z $1 ]] && die "dopamd requires at least one argument"
1657 1624
1658 use pam || return 0 1625 use pam || return 0
1659 1626
1660 insinto /etc/pam.d 1627 INSDESTTREE=/etc/pam.d \
1661 # these are the default doins options, but be explicit just in case
1662 insopts -m 0644 -o root -g root
1663 doins "$@" || die "failed to install $@" 1628 doins "$@" || die "failed to install $@"
1664} 1629}
1665# newpamd <old name> <new name> 1630# newpamd <old name> <new name>
1666# 1631#
1667# Install pam file <old name> as <new name> in /etc/pam.d 1632# Install pam file <old name> as <new name> in /etc/pam.d
1668newpamd() { 1633newpamd() {
1669 [[ $# -ne 2 ]] && die "newpamd requires two arguements" 1634 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1670 1635
1671 use pam || return 0 1636 use pam || return 0
1672 1637
1673 insinto /etc/pam.d 1638 INSDESTTREE=/etc/pam.d \
1674 # these are the default doins options, but be explicit just in case
1675 insopts -m 0644 -o root -g root
1676 newins "$1" "$2" || die "failed to install $1 as $2" 1639 newins "$1" "$2" || die "failed to install $1 as $2"
1677} 1640}
1641
1642# make a wrapper script ...
1643# NOTE: this was originally games_make_wrapper, but I noticed other places where
1644# this could be used, so I have moved it here and made it not games-specific
1645# -- wolf31o2
1646# $1 == wrapper name
1647# $2 == binary to run
1648# $3 == directory to chdir before running binary
1649# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1650# $5 == path for wrapper
1651make_wrapper() {
1652 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1653 local tmpwrapper=$(emktemp)
1654 # We don't want to quote ${bin} so that people can pass complex
1655 # things as $bin ... "./someprog --args"
1656 cat << EOF > "${tmpwrapper}"
1657#!/bin/sh
1658cd "${chdir:-.}"
1659if [ -n "${libdir}" ] ; then
1660 if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
1661 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1662 else
1663 export LD_LIBRARY_PATH="${libdir}"
1664 fi
1665fi
1666exec ${bin} "\$@"
1667EOF
1668 chmod go+rx "${tmpwrapper}"
1669 if [[ -n ${path} ]] ; then
1670 exeinto "${path}"
1671 newexe "${tmpwrapper}" "${wrapper}"
1672 else
1673 newbin "${tmpwrapper}" "${wrapper}"
1674 fi
1675}

Legend:
Removed from v.1.157  
changed lines
  Added in v.1.245

  ViewVC Help
Powered by ViewVC 1.1.20