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

Diff of /eclass/eutils.eclass

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

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

Legend:
Removed from v.1.163  
changed lines
  Added in v.1.248

  ViewVC Help
Powered by ViewVC 1.1.20