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

Diff of /eclass/eutils.eclass

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

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

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

  ViewVC Help
Powered by ViewVC 1.1.20