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

Diff of /eclass/eutils.eclass

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

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

Legend:
Removed from v.1.161  
changed lines
  Added in v.1.252

  ViewVC Help
Powered by ViewVC 1.1.20