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

Diff of /eclass/eutils.eclass

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

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

Legend:
Removed from v.1.159  
changed lines
  Added in v.1.256

  ViewVC Help
Powered by ViewVC 1.1.20