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

Diff of /eclass/eutils.eclass

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

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

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

  ViewVC Help
Powered by ViewVC 1.1.20