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

Diff of /eclass/eutils.eclass

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

Revision 1.152 Revision 1.248
1# Copyright 1999-2004 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.152 2005/02/18 18:04:42 azarah Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.248 2006/08/19 13:52:02 vapier Exp $
4#
5# Author: Martin Schlemmer <azarah@gentoo.org>
6# 4#
7# This eclass is for general purpose functions that most ebuilds 5# This eclass is for general purpose functions that most ebuilds
8# have to implement themselves. 6# have to implement themselves.
9# 7#
10# NB: If you add anything, please comment it! 8# NB: If you add anything, please comment it!
9#
10# Maintainer: see each individual function, base-system@gentoo.org as default
11 11
12inherit multilib 12inherit multilib portability
13ECLASS=eutils
14INHERITED="$INHERITED $ECLASS"
15
16DEPEND="!bootstrap? ( sys-devel/patch )"
17 13
18DESCRIPTION="Based on the ${ECLASS} eclass" 14DESCRIPTION="Based on the ${ECLASS} eclass"
19
20# ecpu_check
21# Usage:
22#
23# ecpu_check array_of_cpu_flags
24#
25# array_of_cpu_flags - An array of cpu flags to check against USE flags
26#
27# Checks user USE related cpu flags against /proc/cpuinfo. If user enables a
28# cpu flag that is not supported in their processor flags, it will warn the
29# user if CROSSCOMPILE is not set to 1 ( because cross compile users are
30# obviously using different cpu flags than their own cpu ). Examples:
31#
32# CPU_FLAGS=(mmx mmx2 sse sse2)
33# ecpu_check CPU_FLAGS
34# Chris White <chriswhite@gentoo.org> (03 Feb 2005)
35
36ecpu_check() {
37 # Think about changing below to: if [ "${CROSSCOMPILE}" -ne 1 -a -e "/proc/cpuinfo" ]
38 # and dropping the else if you do not plan on adding anything to that
39 # empty block ....
40 # PS: also try to add some quoting, and consider rather using ${foo} than $foo ...
41 if [ "${CROSSCOMPILE}" != "1" -a -e "/proc/cpuinfo" ]
42 then
43 CPU_FLAGS=${1}
44 USER_CPU=`grep "flags" /proc/cpuinfo`
45
46 for flags in `seq 1 ${#CPU_FLAGS[@]}`
47 do
48 if has ${CPU_FLAGS[${flags} - 1]} ${USER_CPU} && ! has ${CPU_FLAGS[${flags} - 1]} ${USE}
49 then
50 ewarn "Your system is ${CPU_FLAGS[${flags} - 1]} capable but you don't have it enabled!"
51 ewarn "You might be cross compiling (in this case set CROSSCOMPILE to 1 to disable this warning."
52 fi
53
54 if ! has ${CPU_FLAGS[${flags} - 1]} ${USER_CPU} && has ${CPU_FLAGS[${flags} -1]} ${USE}
55 then
56 ewarn "You have ${CPU_FLAGS[${flags} - 1]} support enabled but your processor doesn't"
57 ewarn "Seem to support it! You might be cross compiling or do not have /proc filesystem"
58 ewarn "enabled. If either is the case, set CROSSCOMPILE to 1 to disable this warning."
59 fi
60 done
61 fi
62}
63 15
64# Wait for the supplied number of seconds. If no argument is supplied, defaults 16# Wait for the supplied number of seconds. If no argument is supplied, defaults
65# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not 17# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not
66# outputting to a terminal, don't wait. For compatability purposes, the argument 18# outputting to a terminal, don't wait. For compatability purposes, the argument
67# must be an integer greater than zero. 19# must be an integer greater than zero.
68# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004) 20# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004)
69epause() { 21epause() {
70 if [ -z "$EPAUSE_IGNORE" ] && [ -t 1 ] ; then 22 [[ -z ${EPAUSE_IGNORE} ]] && sleep ${1:-5}
71 sleep ${1:-5}
72 fi
73} 23}
74 24
75# Beep the specified number of times (defaults to five). If our output 25# Beep the specified number of times (defaults to five). If our output
76# is not a terminal, don't beep. If the EBEEP_IGNORE env var is set, 26# is not a terminal, don't beep. If the EBEEP_IGNORE env var is set,
77# don't beep. 27# don't beep.
78# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004) 28# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004)
79ebeep() { 29ebeep() {
80 local n 30 local n
81 if [ -z "$EBEEP_IGNORE" ] && [ -t 1 ] ; then 31 if [[ -z ${EBEEP_IGNORE} ]] ; then
82 for ((n=1 ; n <= ${1:-5} ; n++)) ; do 32 for ((n=1 ; n <= ${1:-5} ; n++)) ; do
83 echo -ne "\a" 33 echo -ne "\a"
84 sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null 34 sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
85 echo -ne "\a" 35 echo -ne "\a"
86 sleep 1 36 sleep 1
105# to point to the latest version of the library present. 55# to point to the latest version of the library present.
106# 56#
107# <azarah@gentoo.org> (26 Oct 2002) 57# <azarah@gentoo.org> (26 Oct 2002)
108# 58#
109gen_usr_ldscript() { 59gen_usr_ldscript() {
60 if [[ $(type -t _tc_gen_usr_ldscript) == "function" ]] ; then
61 _tc_gen_usr_ldscript "$@"
62 return $?
63 fi
64
65 ewarn "QA Notice: Please upgrade your ebuild to use toolchain-funcs"
66 ewarn "QA Notice: rather than gen_usr_ldscript() from eutils"
67
110 local libdir="$(get_libdir)" 68 local lib libdir=$(get_libdir)
111 # Just make sure it exists 69 # Just make sure it exists
112 dodir /usr/${libdir} 70 dodir /usr/${libdir}
113 71
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
386 fi 329 fi
387 330
388 if [ "${count}" -eq 5 ] 331 if [ "${count}" -eq 5 ]
389 then 332 then
390 echo 333 echo
391 eerror "Failed Patch: ${patchname}!" 334 eerror "Failed Patch: ${patchname} !"
335 eerror " ( ${PATCH_TARGET} )"
392 eerror 336 eerror
393 eerror "Include in your bugreport the contents of:" 337 eerror "Include in your bugreport the contents of:"
394 eerror 338 eerror
395 eerror " ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}" 339 eerror " ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}"
396 echo 340 echo
406 then 350 then
407 einfo "Done with patching" 351 einfo "Done with patching"
408 fi 352 fi
409} 353}
410 354
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 return 0
465
466 if [ ! -r /proc/cpuinfo ]
467 then
468 return 1
469 fi
470
471 # This bit is from H?kan Wessberg <nacka-gentoo@refug.org>, bug #13565.
472 if [ "`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | wc -l`" -gt 0 ]
473 then
474 ADMINOPTS="`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | cut -d= -f2 | sed 's/\"//g'`"
475 ADMINPARAM="`echo ${ADMINOPTS} | gawk '{match($0, /-j *[0-9]*/, opt); print opt[0]}'`"
476 ADMINPARAM="${ADMINPARAM/-j}"
477 fi
478
479 export MAKEOPTS="`echo ${MAKEOPTS} | sed -e 's:-j *[0-9]*::g'`"
480
481 if [ "${ARCH}" = "amd64" -o "${ARCH}" = "x86" -o "${ARCH}" = "hppa" -o \
482 "${ARCH}" = "arm" -o "${ARCH}" = "mips" -o "${ARCH}" = "ia64" ]
483 then
484 # these archs will always have "[Pp]rocessor"
485 jobs="$((`grep -c ^[Pp]rocessor /proc/cpuinfo` * 2))"
486
487 elif [ "${ARCH}" = "sparc" -o "${ARCH}" = "sparc64" ]
488 then
489 # sparc always has "ncpus active"
490 jobs="$((`grep "^ncpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
491
492 elif [ "${ARCH}" = "alpha" ]
493 then
494 # alpha has "cpus active", but only when compiled with SMP
495 if [ "`grep -c "^cpus active" /proc/cpuinfo`" -eq 1 ]
496 then
497 jobs="$((`grep "^cpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
498 else
499 jobs=2
500 fi
501
502 elif [ "${ARCH}" = "ppc" -o "${ARCH}" = "ppc64" ]
503 then
504 # ppc has "processor", but only when compiled with SMP
505 if [ "`grep -c "^processor" /proc/cpuinfo`" -eq 1 ]
506 then
507 jobs="$((`grep -c ^processor /proc/cpuinfo` * 2))"
508 else
509 jobs=2
510 fi
511 elif [ "${ARCH}" = "s390" ]
512 then
513 # s390 has "# processors : "
514 jobs="$((`grep "^\# processors" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
515 else
516 jobs="$((`grep -c ^cpu /proc/cpuinfo` * 2))"
517 die "Unknown ARCH -- ${ARCH}!"
518 fi
519
520 # Make sure the number is valid ...
521 if [ "${jobs}" -lt 1 ]
522 then
523 jobs=1
524 fi
525
526 if [ -n "${ADMINPARAM}" ]
527 then
528 if [ "${jobs}" -gt "${ADMINPARAM}" ]
529 then
530 einfo "Setting make jobs to \"-j${ADMINPARAM}\" to ensure successful merge ..."
531 export MAKEOPTS="${MAKEOPTS} -j${ADMINPARAM}"
532 else
533 einfo "Setting make jobs to \"-j${jobs}\" to ensure successful merge ..."
534 export MAKEOPTS="${MAKEOPTS} -j${jobs}"
535 fi
536 fi
537}
538
539# Cheap replacement for when debianutils (and thus mktemp) 355# Cheap replacement for when debianutils (and thus mktemp)
540# does not exist on the users system 356# does not exist on the users system
541# vapier@gentoo.org 357# vapier@gentoo.org
542# 358#
543# Takes just 1 optional parameter (the directory to create tmpfile in) 359# Takes just 1 optional parameter (the directory to create tmpfile in)
544emktemp() { 360emktemp() {
545 local exe="touch" 361 local exe="touch"
546 [ "$1" == "-d" ] && exe="mkdir" && shift 362 [[ $1 == -d ]] && exe="mkdir" && shift
547 local topdir="$1" 363 local topdir=$1
548 364
549 if [ -z "${topdir}" ] 365 if [[ -z ${topdir} ]] ; then
550 then
551 [ -z "${T}" ] \ 366 [[ -z ${T} ]] \
552 && topdir="/tmp" \ 367 && topdir="/tmp" \
553 || topdir="${T}" 368 || topdir=${T}
554 fi 369 fi
555 370
556 if [ -z "$(type -p mktemp)" ] 371 if [[ -z $(type -p mktemp) ]] ; then
557 then
558 local tmp=/ 372 local tmp=/
559 while [ -e "${tmp}" ] ; do 373 while [[ -e ${tmp} ]] ; do
560 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 374 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
561 done 375 done
562 ${exe} "${tmp}" 376 ${exe} "${tmp}" || ${exe} -p "${tmp}"
563 echo "${tmp}" 377 echo "${tmp}"
564 else 378 else
565 [ "${exe}" == "touch" ] \ 379 if [[ ${exe} == "touch" ]] ; then
566 && exe="-p" \ 380 [[ ${USERLAND} == "GNU" ]] \
567 || exe="-d" 381 && mktemp -p "${topdir}" \
568 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
569 fi 388 fi
570} 389}
571 390
572# Small wrapper for getent (Linux), nidump (Mac OS X), 391# Small wrapper for getent (Linux), nidump (Mac OS X),
573# and pw (FreeBSD) used in enewuser()/enewgroup() 392# and pw (FreeBSD) used in enewuser()/enewgroup()
574# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 393# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
575# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 394# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
576# 395#
577# egetent(database, key) 396# egetent(database, key)
578egetent() { 397egetent() {
579 if useq ppc-macos ; then 398 case ${CHOST} in
399 *-darwin*)
580 case "$2" in 400 case "$2" in
581 *[!0-9]*) # Non numeric 401 *[!0-9]*) # Non numeric
582 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 402 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
583 ;; 403 ;;
584 *) # Numeric 404 *) # Numeric
585 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 405 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
586 ;; 406 ;;
587 esac 407 esac
588 elif useq x86-fbsd ; then 408 ;;
589 local action 409 *-freebsd*|*-dragonfly*)
590 if [ "$1" == "passwd" ] 410 local opts action="user"
591 then 411 [[ $1 == "passwd" ]] || action="group"
592 action="user" 412
593 else 413 # lookup by uid/gid
594 action="group" 414 if [[ $2 == [[:digit:]]* ]] ; then
415 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
595 fi 416 fi
417
596 pw show "${action}" "$2" -q 418 pw show ${action} ${opts} "$2" -q
597 else 419 ;;
420 *-netbsd*|*-openbsd*)
421 grep "$2:\*:" /etc/$1
422 ;;
423 *)
598 which nscd >& /dev/null && nscd -i "$1" 424 type -p nscd >& /dev/null && nscd -i "$1"
599 getent "$1" "$2" 425 getent "$1" "$2"
600 fi 426 ;;
427 esac
601} 428}
602 429
603# Simplify/standardize adding users to the system 430# Simplify/standardize adding users to the system
604# vapier@gentoo.org 431# vapier@gentoo.org
605# 432#
612# shell: /bin/false 439# shell: /bin/false
613# homedir: /dev/null 440# homedir: /dev/null
614# groups: none 441# groups: none
615# extra: comment of 'added by portage for ${PN}' 442# extra: comment of 'added by portage for ${PN}'
616enewuser() { 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
617 # get the username 451 # get the username
618 local euser="$1"; shift 452 local euser=$1; shift
619 if [ -z "${euser}" ] 453 if [[ -z ${euser} ]] ; then
620 then
621 eerror "No username specified !" 454 eerror "No username specified !"
622 die "Cannot call enewuser without a username" 455 die "Cannot call enewuser without a username"
623 fi 456 fi
624 457
625 # lets see if the username already exists 458 # lets see if the username already exists
626 if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ] 459 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then
627 then
628 return 0 460 return 0
629 fi 461 fi
630 einfo "Adding user '${euser}' to your system ..." 462 einfo "Adding user '${euser}' to your system ..."
631 463
632 # options to pass to useradd 464 # options to pass to useradd
633 local opts= 465 local opts=
634 466
635 # handle uid 467 # handle uid
636 local euid="$1"; shift 468 local euid=$1; shift
637 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] 469 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then
638 then
639 if [ "${euid}" -gt 0 ] 470 if [[ ${euid} -gt 0 ]] ; then
640 then
641 if [ ! -z "`egetent passwd ${euid}`" ] 471 if [[ ! -z $(egetent passwd ${euid}) ]] ; then
642 then
643 euid="next" 472 euid="next"
644 fi 473 fi
645 else 474 else
646 eerror "Userid given but is not greater than 0 !" 475 eerror "Userid given but is not greater than 0 !"
647 die "${euid} is not a valid UID" 476 die "${euid} is not a valid UID"
648 fi 477 fi
649 else 478 else
650 euid="next" 479 euid="next"
651 fi 480 fi
652 if [ "${euid}" == "next" ] 481 if [[ ${euid} == "next" ]] ; then
653 then 482 for euid in $(seq 101 999) ; do
654 local pwrange
655 if [ "${USERLAND}" == "BSD" ] ; then
656 pwrange="`jot 898 101`"
657 else
658 pwrange="`seq 101 999`"
659 fi
660 for euid in ${pwrange} ; do
661 [ -z "`egetent passwd ${euid}`" ] && break 483 [[ -z $(egetent passwd ${euid}) ]] && break
662 done 484 done
663 fi 485 fi
664 opts="${opts} -u ${euid}" 486 opts="${opts} -u ${euid}"
665 einfo " - Userid: ${euid}" 487 einfo " - Userid: ${euid}"
666 488
667 # handle shell 489 # handle shell
668 local eshell="$1"; shift 490 local eshell=$1; shift
669 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ] 491 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
670 then 492 if [[ ! -e ${ROOT}${eshell} ]] ; then
671 if [ ! -e "${eshell}" ]
672 then
673 eerror "A shell was specified but it does not exist !" 493 eerror "A shell was specified but it does not exist !"
674 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"
675 fi 499 fi
676 else 500 else
677 if [ "${USERLAND}" == "BSD" ] 501 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
678 then 502 [[ -x ${ROOT}${shell} ]] && break
679 eshell="/usr/bin/false" 503 done
680 else 504
681 eshell="/bin/false" 505 if [[ ${shell} == "/dev/null" ]] ; then
506 eerror "Unable to identify the shell to use"
507 die "Unable to identify the shell to use"
682 fi 508 fi
509
510 eshell=${shell}
683 fi 511 fi
684 einfo " - Shell: ${eshell}" 512 einfo " - Shell: ${eshell}"
685 opts="${opts} -s ${eshell}" 513 opts="${opts} -s ${eshell}"
686 514
687 # handle homedir 515 # handle homedir
688 local ehome="$1"; shift 516 local ehome=$1; shift
689 if [ -z "${ehome}" ] && [ "${eshell}" != "-1" ] 517 if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then
690 then
691 ehome="/dev/null" 518 ehome="/dev/null"
692 fi 519 fi
693 einfo " - Home: ${ehome}" 520 einfo " - Home: ${ehome}"
694 opts="${opts} -d ${ehome}" 521 opts="${opts} -d ${ehome}"
695 522
696 # handle groups 523 # handle groups
697 local egroups="$1"; shift 524 local egroups=$1; shift
698 if [ ! -z "${egroups}" ] 525 if [[ ! -z ${egroups} ]] ; then
699 then
700 local oldifs="${IFS}" 526 local oldifs=${IFS}
701 local defgroup="" exgroups="" 527 local defgroup="" exgroups=""
702 528
703 export IFS="," 529 export IFS=","
704 for g in ${egroups} 530 for g in ${egroups} ; do
705 do
706 export IFS="${oldifs}" 531 export IFS=${oldifs}
707 if [ -z "`egetent group \"${g}\"`" ] 532 if [[ -z $(egetent group "${g}") ]] ; then
708 then
709 eerror "You must add group ${g} to the system first" 533 eerror "You must add group ${g} to the system first"
710 die "${g} is not a valid GID" 534 die "${g} is not a valid GID"
711 fi 535 fi
712 if [ -z "${defgroup}" ] 536 if [[ -z ${defgroup} ]] ; then
713 then
714 defgroup="${g}" 537 defgroup=${g}
715 else 538 else
716 exgroups="${exgroups},${g}" 539 exgroups="${exgroups},${g}"
717 fi 540 fi
718 export IFS="," 541 export IFS=","
719 done 542 done
720 export IFS="${oldifs}" 543 export IFS=${oldifs}
721 544
722 opts="${opts} -g ${defgroup}" 545 opts="${opts} -g ${defgroup}"
723 if [ ! -z "${exgroups}" ] 546 if [[ ! -z ${exgroups} ]] ; then
724 then
725 opts="${opts} -G ${exgroups:1}" 547 opts="${opts} -G ${exgroups:1}"
726 fi 548 fi
727 else 549 else
728 egroups="(none)" 550 egroups="(none)"
729 fi 551 fi
730 einfo " - Groups: ${egroups}" 552 einfo " - Groups: ${egroups}"
731 553
732 # handle extra and add the user 554 # handle extra and add the user
733 local eextra="$@"
734 local oldsandbox="${SANDBOX_ON}" 555 local oldsandbox=${SANDBOX_ON}
735 export SANDBOX_ON="0" 556 export SANDBOX_ON="0"
736 if useq ppc-macos 557 case ${CHOST} in
737 then 558 *-darwin*)
738 ### Make the user 559 ### Make the user
739 if [ -z "${eextra}" ] 560 if [[ -z $@ ]] ; then
740 then
741 dscl . create /users/${euser} uid ${euid} 561 dscl . create /users/${euser} uid ${euid}
742 dscl . create /users/${euser} shell ${eshell} 562 dscl . create /users/${euser} shell ${eshell}
743 dscl . create /users/${euser} home ${ehome} 563 dscl . create /users/${euser} home ${ehome}
744 dscl . create /users/${euser} realname "added by portage for ${PN}" 564 dscl . create /users/${euser} realname "added by portage for ${PN}"
745 ### Add the user to the groups specified 565 ### Add the user to the groups specified
746 local oldifs="${IFS}" 566 local oldifs=${IFS}
747 export IFS="," 567 export IFS=","
748 for g in ${egroups} 568 for g in ${egroups} ; do
749 do
750 dscl . merge /groups/${g} users ${euser} 569 dscl . merge /groups/${g} users ${euser}
751 done 570 done
752 export IFS="${oldifs}" 571 export IFS=${oldifs}
753 else 572 else
754 einfo "Extra options are not supported on macos yet" 573 einfo "Extra options are not supported on Darwin yet"
755 einfo "Please report the ebuild along with the info below" 574 einfo "Please report the ebuild along with the info below"
756 einfo "eextra: ${eextra}" 575 einfo "eextra: $@"
757 die "Required function missing" 576 die "Required function missing"
758 fi 577 fi
759 elif use x86-fbsd ; then 578 ;;
760 if [ -z "${eextra}" ] 579 *-freebsd*|*-dragonfly*)
761 then 580 if [[ -z $@ ]] ; then
762 pw useradd ${euser} ${opts} \ 581 pw useradd ${euser} ${opts} \
763 -c "added by portage for ${PN}" \ 582 -c "added by portage for ${PN}" \
764 die "enewuser failed" 583 die "enewuser failed"
765 else 584 else
766 einfo " - Extra: ${eextra}" 585 einfo " - Extra: $@"
767 pw useradd ${euser} ${opts} \ 586 pw useradd ${euser} ${opts} \
768 -c ${eextra} || die "enewuser failed" 587 "$@" || die "enewuser failed"
769 fi 588 fi
589 ;;
590
591 *-netbsd*)
592 if [[ -z $@ ]] ; then
593 useradd ${opts} ${euser} || die "enewuser failed"
770 else 594 else
771 if [ -z "${eextra}" ] 595 einfo " - Extra: $@"
772 then 596 useradd ${opts} ${euser} "$@" || die "enewuser failed"
597 fi
598 ;;
599
600 *-openbsd*)
601 if [[ -z $@ ]] ; then
602 useradd -u ${euid} -s ${eshell} \
603 -d ${ehome} -c "Added by portage for ${PN}" \
604 -g ${egroups} ${euser} || die "enewuser failed"
605 else
606 einfo " - Extra: $@"
607 useradd -u ${euid} -s ${eshell} \
608 -d ${ehome} -c "Added by portage for ${PN}" \
609 -g ${egroups} ${euser} "$@" || die "enewuser failed"
610 fi
611 ;;
612
613 *)
614 if [[ -z $@ ]] ; then
773 useradd ${opts} ${euser} \ 615 useradd ${opts} ${euser} \
774 -c "added by portage for ${PN}" \ 616 -c "added by portage for ${PN}" \
775 || die "enewuser failed" 617 || die "enewuser failed"
776 else 618 else
777 einfo " - Extra: ${eextra}" 619 einfo " - Extra: $@"
778 useradd ${opts} ${euser} ${eextra} \ 620 useradd ${opts} ${euser} "$@" \
779 || die "enewuser failed" 621 || die "enewuser failed"
780 fi 622 fi
623 ;;
624 esac
625
626 if [[ ! -e ${ROOT}/${ehome} ]] ; then
627 einfo " - Creating ${ehome} in ${ROOT}"
628 mkdir -p "${ROOT}/${ehome}"
629 chown ${euser} "${ROOT}/${ehome}"
630 chmod 755 "${ROOT}/${ehome}"
781 fi 631 fi
632
782 export SANDBOX_ON="${oldsandbox}" 633 export SANDBOX_ON=${oldsandbox}
783
784 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ]
785 then
786 einfo " - Creating ${ehome} in ${D}"
787 dodir ${ehome}
788 fowners ${euser} ${ehome}
789 fperms 755 ${ehome}
790 fi
791} 634}
792 635
793# Simplify/standardize adding groups to the system 636# Simplify/standardize adding groups to the system
794# vapier@gentoo.org 637# vapier@gentoo.org
795# 638#
798# Default values if you do not specify any: 641# Default values if you do not specify any:
799# groupname: REQUIRED ! 642# groupname: REQUIRED !
800# gid: next available (see groupadd(8)) 643# gid: next available (see groupadd(8))
801# extra: none 644# extra: none
802enewgroup() { 645enewgroup() {
646 case ${EBUILD_PHASE} in
647 unpack|compile|test|install)
648 eerror "'enewgroup()' called from '${EBUILD_PHASE}()' which is not a pkg_* function."
649 eerror "Package fails at QA and at life. Please file a bug."
650 die "Bad package! enewgroup is only for use in pkg_* functions!"
651 esac
652
803 # get the group 653 # get the group
804 local egroup="$1"; shift 654 local egroup="$1"; shift
805 if [ -z "${egroup}" ] 655 if [ -z "${egroup}" ]
806 then 656 then
807 eerror "No group specified !" 657 eerror "No group specified !"
824 then 674 then
825 if [ "${egid}" -gt 0 ] 675 if [ "${egid}" -gt 0 ]
826 then 676 then
827 if [ -z "`egetent group ${egid}`" ] 677 if [ -z "`egetent group ${egid}`" ]
828 then 678 then
829 if useq ppc-macos ; then 679 if [[ "${CHOST}" == *-darwin* ]]; then
830 opts="${opts} ${egid}" 680 opts="${opts} ${egid}"
831 else 681 else
832 opts="${opts} -g ${egid}" 682 opts="${opts} -g ${egid}"
833 fi 683 fi
834 else 684 else
848 opts="${opts} ${eextra}" 698 opts="${opts} ${eextra}"
849 699
850 # add the group 700 # add the group
851 local oldsandbox="${SANDBOX_ON}" 701 local oldsandbox="${SANDBOX_ON}"
852 export SANDBOX_ON="0" 702 export SANDBOX_ON="0"
853 if useq ppc-macos ; then 703 case ${CHOST} in
704 *-darwin*)
854 if [ ! -z "${eextra}" ]; 705 if [ ! -z "${eextra}" ];
855 then 706 then
856 einfo "Extra options are not supported on macos yet" 707 einfo "Extra options are not supported on Darwin/OS X yet"
857 einfo "Please report the ebuild along with the info below" 708 einfo "Please report the ebuild along with the info below"
858 einfo "eextra: ${eextra}" 709 einfo "eextra: ${eextra}"
859 die "Required function missing" 710 die "Required function missing"
860 fi 711 fi
861 712
862 # If we need the next available 713 # If we need the next available
863 case ${egid} in 714 case ${egid} in
864 *[!0-9]*) # Non numeric 715 *[!0-9]*) # Non numeric
865 for egid in `jot 898 101`; do 716 for egid in $(seq 101 999); do
866 [ -z "`egetent group ${egid}`" ] && break 717 [ -z "`egetent group ${egid}`" ] && break
867 done 718 done
868 esac 719 esac
869 dscl . create /groups/${egroup} gid ${egid} 720 dscl . create /groups/${egroup} gid ${egid}
870 dscl . create /groups/${egroup} passwd '*' 721 dscl . create /groups/${egroup} passwd '*'
871 elif use x86-fbsd ; then 722 ;;
723
724 *-freebsd*|*-dragonfly*)
872 case ${egid} in 725 case ${egid} in
873 *[!0-9]*) # Non numeric 726 *[!0-9]*) # Non numeric
874 for egid in `jot 898 101`; do 727 for egid in $(seq 101 999); do
875 [ -z "`egetent group ${egid}`" ] && break 728 [ -z "`egetent group ${egid}`" ] && break
876 done 729 done
877 esac 730 esac
878 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 731 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
879 else 732 ;;
733
734 *-netbsd*)
735 case ${egid} in
736 *[!0-9]*) # Non numeric
737 for egid in $(seq 101 999); do
738 [ -z "`egetent group ${egid}`" ] && break
739 done
740 esac
741 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
742 ;;
743
744 *)
880 groupadd ${opts} ${egroup} || die "enewgroup failed" 745 groupadd ${opts} ${egroup} || die "enewgroup failed"
881 fi 746 ;;
747 esac
882 export SANDBOX_ON="${oldsandbox}" 748 export SANDBOX_ON="${oldsandbox}"
883} 749}
884 750
885# Simple script to replace 'dos2unix' binaries 751# Simple script to replace 'dos2unix' binaries
886# vapier@gentoo.org 752# vapier@gentoo.org
903 769
904# Make a desktop file ! 770# Make a desktop file !
905# Great for making those icons in kde/gnome startmenu ! 771# Great for making those icons in kde/gnome startmenu !
906# Amaze your friends ! Get the women ! Join today ! 772# Amaze your friends ! Get the women ! Join today !
907# 773#
908# make_desktop_entry(<binary>, [name], [icon], [type], [path]) 774# make_desktop_entry(<command>, [name], [icon], [type], [path])
909# 775#
910# binary: what binary does the app run with ? 776# binary: what command does the app run with ?
911# name: the name that will show up in the menu 777# name: the name that will show up in the menu
912# icon: give your little like a pretty little icon ... 778# icon: give your little like a pretty little icon ...
913# this can be relative (to /usr/share/pixmaps) or 779# this can be relative (to /usr/share/pixmaps) or
914# a full path to an icon 780# a full path to an icon
915# type: what kind of application is this ? for categories: 781# type: what kind of application is this ? for categories:
916# http://www.freedesktop.org/standards/menu-spec/ 782# http://www.freedesktop.org/Standards/desktop-entry-spec
917# path: if your app needs to startup in a specific dir 783# path: if your app needs to startup in a specific dir
918make_desktop_entry() { 784make_desktop_entry() {
919 [ -z "$1" ] && eerror "make_desktop_entry: You must specify the executable" && return 1 785 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
920 786
921 local exec="${1}" 787 local exec=${1}
922 local name="${2:-${PN}}" 788 local name=${2:-${PN}}
923 local icon="${3:-${PN}.png}" 789 local icon=${3:-${PN}.png}
924 local type="${4}" 790 local type=${4}
925 local subdir="${6}" 791 local path=${5}
926 local path="${5:-${GAMES_BINDIR}}" 792
927 if [ -z "${type}" ] 793 if [[ -z ${type} ]] ; then
928 then 794 local catmaj=${CATEGORY%%-*}
929 case ${CATEGORY} in 795 local catmin=${CATEGORY##*-}
930 "app-emulation") 796 case ${catmaj} in
931 type=Emulator 797 app)
932 subdir="Emulation" 798 case ${catmin} in
799 admin) type=System;;
800 cdr) type=DiscBurning;;
801 dicts) type=Dictionary;;
802 editors) type=TextEditor;;
803 emacs) type=TextEditor;;
804 emulation) type=Emulator;;
805 laptop) type=HardwareSettings;;
806 office) type=Office;;
807 vim) type=TextEditor;;
808 xemacs) type=TextEditor;;
809 *) type=;;
810 esac
933 ;; 811 ;;
934 "games-"*) 812
935 type=Game 813 dev)
936 subdir="Games" 814 type="Development"
937 ;; 815 ;;
938 "net-"*) 816
939 type=Network 817 games)
940 subdir="${type}" 818 case ${catmin} in
819 action) type=ActionGame;;
820 arcade) type=ArcadeGame;;
821 board) type=BoardGame;;
822 kid) type=KidsGame;;
823 emulation) type=Emulator;;
824 puzzle) type=LogicGame;;
825 rpg) type=RolePlaying;;
826 roguelike) type=RolePlaying;;
827 simulation) type=Simulation;;
828 sports) type=SportsGame;;
829 strategy) type=StrategyGame;;
830 *) type=;;
831 esac
832 type="Game;${type}"
941 ;; 833 ;;
834
835 mail)
836 type="Network;Email"
837 ;;
838
839 media)
840 case ${catmin} in
841 gfx) type=Graphics;;
842 radio) type=Tuner;;
843 sound) type=Audio;;
844 tv) type=TV;;
845 video) type=Video;;
846 *) type=;;
847 esac
848 type="AudioVideo;${type}"
849 ;;
850
851 net)
852 case ${catmin} in
853 dialup) type=Dialup;;
854 ftp) type=FileTransfer;;
855 im) type=InstantMessaging;;
856 irc) type=IRCClient;;
857 mail) type=Email;;
858 news) type=News;;
859 nntp) type=News;;
860 p2p) type=FileTransfer;;
861 *) type=;;
862 esac
863 type="Network;${type}"
864 ;;
865
866 sci)
867 case ${catmin} in
868 astro*) type=Astronomy;;
869 bio*) type=Biology;;
870 calc*) type=Calculator;;
871 chem*) type=Chemistry;;
872 geo*) type=Geology;;
873 math*) type=Math;;
874 *) type=;;
875 esac
876 type="Science;${type}"
877 ;;
878
879 www)
880 case ${catmin} in
881 client) type=WebBrowser;;
882 *) type=;;
883 esac
884 type="Network"
885 ;;
886
942 *) 887 *)
943 type= 888 type=
944 subdir=
945 ;; 889 ;;
946 esac 890 esac
947 fi 891 fi
892 if [ "${SLOT}" == "0" ] ; then
893 local desktop_name="${PN}"
894 else
895 local desktop_name="${PN}-${SLOT}"
896 fi
948 local desktop="${T}/${exec}.desktop" 897 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
898# local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
949 899
950echo "[Desktop Entry] 900echo "[Desktop Entry]
951Encoding=UTF-8 901Encoding=UTF-8
952Version=0.9.2 902Version=0.9.2
953Name=${name} 903Name=${name}
954Type=Application 904Type=Application
955Comment=${DESCRIPTION} 905Comment=${DESCRIPTION}
956Exec=${exec} 906Exec=${exec}
907TryExec=${exec%% *}
957Path=${path} 908Path=${path}
958Icon=${icon} 909Icon=${icon}
959Categories=Application;${type};" > "${desktop}" 910Categories=Application;${type};" > "${desktop}"
960 911
912 (
913 # wrap the env here so that the 'insinto' call
914 # doesn't corrupt the env of the caller
961 insinto /usr/share/applications 915 insinto /usr/share/applications
962 doins "${desktop}" 916 doins "${desktop}"
963 917 )
964 return 0
965} 918}
966 919
967# Make a GDM/KDM Session file 920# Make a GDM/KDM Session file
968# 921#
969# make_desktop_entry(<title>, <command>) 922# make_desktop_entry(<title>, <command>)
970# title: File to execute to start the Window Manager 923# title: File to execute to start the Window Manager
971# command: Name of the Window Manager 924# command: Name of the Window Manager
972 925
973make_session_desktop() { 926make_session_desktop() {
974
975 [ -z "$1" ] && eerror "make_session_desktop: You must specify the title" && return 1 927 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1
976 [ -z "$2" ] && eerror "make_session_desktop: You must specify the command" && return 1 928 [[ -z $2 ]] && eerror "make_session_desktop: You must specify the command" && return 1
977 929
978 local title="${1}" 930 local title=$1
979 local command="${2}" 931 local command=$2
980 local desktop="${T}/${wm}.desktop" 932 local desktop=${T}/${wm}.desktop
981 933
982echo "[Desktop Entry] 934echo "[Desktop Entry]
983Encoding=UTF-8 935Encoding=UTF-8
984Name=${title} 936Name=${title}
985Comment=This session logs you into ${title} 937Comment=This session logs you into ${title}
987TryExec=${command} 939TryExec=${command}
988Type=Application" > "${desktop}" 940Type=Application" > "${desktop}"
989 941
990 insinto /usr/share/xsessions 942 insinto /usr/share/xsessions
991 doins "${desktop}" 943 doins "${desktop}"
992
993 return 0
994} 944}
995 945
996domenu() { 946domenu() {
997 local i 947 local i j
998 local j
999 insinto /usr/share/applications 948 insinto /usr/share/applications
1000 for i in ${@} 949 for i in "$@" ; do
1001 do
1002 if [ -f "${i}" ]; 950 if [[ -f ${i} ]] ; then
1003 then
1004 doins ${i} 951 doins "${i}"
1005 elif [ -d "${i}" ]; 952 elif [[ -d ${i} ]] ; then
1006 then
1007 for j in ${i}/*.desktop 953 for j in "${i}"/*.desktop ; do
1008 do
1009 doins ${j} 954 doins "${j}"
1010 done 955 done
1011 fi 956 fi
1012 done 957 done
1013} 958}
959newmenu() {
960 insinto /usr/share/applications
961 newins "$1" "$2"
962}
1014 963
1015doicon() { 964doicon() {
1016 local i 965 local i j
1017 local j
1018 insinto /usr/share/pixmaps 966 insinto /usr/share/pixmaps
1019 for i in ${@} 967 for i in "$@" ; do
1020 do
1021 if [ -f "${i}" ]; 968 if [[ -f ${i} ]] ; then
1022 then
1023 doins ${i} 969 doins "${i}"
1024 elif [ -d "${i}" ]; 970 elif [[ -d ${i} ]] ; then
1025 then
1026 for j in ${i}/*.png 971 for j in "${i}"/*.png ; do
1027 do
1028 doins ${j} 972 doins "${j}"
1029 done 973 done
1030 fi 974 fi
1031 done 975 done
976}
977newicon() {
978 insinto /usr/share/pixmaps
979 newins "$1" "$2"
1032} 980}
1033 981
1034############################################################## 982##############################################################
1035# END: Handle .desktop files and menu entries # 983# END: Handle .desktop files and menu entries #
1036############################################################## 984##############################################################
1037 985
1038 986
1039# for internal use only (unpack_pdv and unpack_makeself) 987# for internal use only (unpack_pdv and unpack_makeself)
1040find_unpackable_file() { 988find_unpackable_file() {
1041 local src="$1" 989 local src=$1
1042 if [ -z "${src}" ] 990 if [[ -z ${src} ]] ; then
1043 then
1044 src="${DISTDIR}/${A}" 991 src=${DISTDIR}/${A}
1045 else 992 else
1046 if [ -e "${DISTDIR}/${src}" ] 993 if [[ -e ${DISTDIR}/${src} ]] ; then
1047 then
1048 src="${DISTDIR}/${src}" 994 src=${DISTDIR}/${src}
1049 elif [ -e "${PWD}/${src}" ] 995 elif [[ -e ${PWD}/${src} ]] ; then
1050 then
1051 src="${PWD}/${src}" 996 src=${PWD}/${src}
1052 elif [ -e "${src}" ] 997 elif [[ -e ${src} ]] ; then
1053 then
1054 src="${src}" 998 src=${src}
1055 fi
1056 fi 999 fi
1057 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 1000 fi
1001 [[ ! -e ${src} ]] && return 1
1058 echo "${src}" 1002 echo "${src}"
1059} 1003}
1060 1004
1061# Unpack those pesky pdv generated files ... 1005# Unpack those pesky pdv generated files ...
1062# They're self-unpacking programs with the binary package stuffed in 1006# They're self-unpacking programs with the binary package stuffed in
1077# lseek 1021# lseek
1078# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1022# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
1079# lseek(3, -4, SEEK_END) = 2981250 1023# lseek(3, -4, SEEK_END) = 2981250
1080# thus we would pass in the value of '4' as the second parameter. 1024# thus we would pass in the value of '4' as the second parameter.
1081unpack_pdv() { 1025unpack_pdv() {
1082 local src="`find_unpackable_file $1`" 1026 local src=$(find_unpackable_file $1)
1083 local sizeoff_t="$2" 1027 local sizeoff_t=$2
1084 1028
1029 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1085 [ -z "${sizeoff_t}" ] && die "No idea what off_t size was used for this pdv :(" 1030 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
1086 1031
1087 local shrtsrc="`basename ${src}`" 1032 local shrtsrc=$(basename "${src}")
1088 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1033 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1089 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1034 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
1090 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"` 1035 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
1091 1036
1092 # grab metadata for debug reasons 1037 # grab metadata for debug reasons
1156# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1101# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1157# - If the file is not specified then unpack will utilize ${A}. 1102# - If the file is not specified then unpack will utilize ${A}.
1158# - If the offset is not specified then we will attempt to extract 1103# - If the offset is not specified then we will attempt to extract
1159# the proper offset from the script itself. 1104# the proper offset from the script itself.
1160unpack_makeself() { 1105unpack_makeself() {
1106 local src_input=${1:-${A}}
1161 local src="$(find_unpackable_file "$1")" 1107 local src=$(find_unpackable_file "${src_input}")
1162 local skip="$2" 1108 local skip=$2
1163 local exe="$3" 1109 local exe=$3
1164 1110
1111 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1112
1165 local shrtsrc="$(basename "${src}")" 1113 local shrtsrc=$(basename "${src}")
1166 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1114 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1167 if [ -z "${skip}" ] 1115 if [[ -z ${skip} ]] ; then
1168 then
1169 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1116 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1170 local skip=0 1117 local skip=0
1171 exe=tail 1118 exe=tail
1172 case ${ver} in 1119 case ${ver} in
1173 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1120 1.5.*|1.6.0-nv) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
1174 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1121 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1175 ;; 1122 ;;
1176 2.0|2.0.1) 1123 2.0|2.0.1)
1177 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-) 1124 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-)
1178 ;; 1125 ;;
1186 ;; 1133 ;;
1187 2.1.3) 1134 2.1.3)
1188 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1135 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1189 let skip="skip + 1" 1136 let skip="skip + 1"
1190 ;; 1137 ;;
1191 2.1.4) 1138 2.1.4|2.1.5)
1192 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1) 1139 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
1193 skip=$(head -n ${skip} "${src}" | wc -c) 1140 skip=$(head -n ${skip} "${src}" | wc -c)
1194 exe="dd" 1141 exe="dd"
1195 ;; 1142 ;;
1196 *) 1143 *)
1241check_license() { 1188check_license() {
1242 local lic=$1 1189 local lic=$1
1243 if [ -z "${lic}" ] ; then 1190 if [ -z "${lic}" ] ; then
1244 lic="${PORTDIR}/licenses/${LICENSE}" 1191 lic="${PORTDIR}/licenses/${LICENSE}"
1245 else 1192 else
1246 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1193 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1247 lic="${PORTDIR}/licenses/${src}" 1194 lic="${PORTDIR}/licenses/${lic}"
1248 elif [ -e "${PWD}/${src}" ] ; then 1195 elif [ -e "${PWD}/${lic}" ] ; then
1249 lic="${PWD}/${src}" 1196 lic="${PWD}/${lic}"
1250 elif [ -e "${src}" ] ; then 1197 elif [ -e "${lic}" ] ; then
1251 lic="${src}" 1198 lic="${lic}"
1252 fi
1253 fi 1199 fi
1200 fi
1254 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1201 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1255 local l="`basename ${lic}`" 1202 local l="`basename ${lic}`"
1256 1203
1257 # here is where we check for the licenses the user already 1204 # here is where we check for the licenses the user already
1258 # accepted ... if we don't find a match, we make the user accept 1205 # accepted ... if we don't find a match, we make the user accept
1259 local shopts=$- 1206 local shopts=$-
1301# and when the function returns, you can assume that the cd has been 1248# and when the function returns, you can assume that the cd has been
1302# found at CDROM_ROOT. 1249# found at CDROM_ROOT.
1303# 1250#
1304# normally the cdrom functions will refer to the cds as 'cd #1', 'cd #2', 1251# normally the cdrom functions will refer to the cds as 'cd #1', 'cd #2',
1305# etc... if you want to give the cds better names, then just export 1252# etc... if you want to give the cds better names, then just export
1306# the CDROM_NAME_X variables before calling cdrom_get_cds(). 1253# the appropriate CDROM_NAME variable before calling cdrom_get_cds().
1254# - CDROM_NAME="fooie cd" - for when you only want 1 cd
1255# - CDROM_NAME_1="install cd" - for when you want more than 1 cd
1256# CDROM_NAME_2="data cd"
1257# - CDROM_NAME_SET=( "install cd" "data cd" ) - short hand for CDROM_NAME_#
1307# 1258#
1308# for those multi cd ebuilds, see the cdrom_load_next_cd() below. 1259# for those multi cd ebuilds, see the cdrom_load_next_cd() below.
1309# 1260#
1310# Usage: cdrom_get_cds <file on cd1> [file on cd2] [file on cd3] [...] 1261# Usage: cdrom_get_cds <file on cd1> [file on cd2] [file on cd3] [...]
1311# - this will attempt to locate a cd based upon a file that is on 1262# - this will attempt to locate a cd based upon a file that is on
1315 # first we figure out how many cds we're dealing with by 1266 # first we figure out how many cds we're dealing with by
1316 # the # of files they gave us 1267 # the # of files they gave us
1317 local cdcnt=0 1268 local cdcnt=0
1318 local f= 1269 local f=
1319 for f in "$@" ; do 1270 for f in "$@" ; do
1320 cdcnt=$((cdcnt + 1)) 1271 ((++cdcnt))
1321 export CDROM_CHECK_${cdcnt}="$f" 1272 export CDROM_CHECK_${cdcnt}="$f"
1322 done 1273 done
1323 export CDROM_TOTAL_CDS=${cdcnt} 1274 export CDROM_TOTAL_CDS=${cdcnt}
1324 export CDROM_CURRENT_CD=1 1275 export CDROM_CURRENT_CD=1
1325 1276
1326 # now we see if the user gave use CD_ROOT ... 1277 # now we see if the user gave use CD_ROOT ...
1327 # if they did, let's just believe them that it's correct 1278 # if they did, let's just believe them that it's correct
1328 if [[ ! -z ${CD_ROOT} ]] ; then
1329 export CDROM_ROOT=${CD_ROOT}
1330 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1331 return
1332 fi
1333 # do the same for CD_ROOT_X
1334 if [[ ! -z ${CD_ROOT_1} ]] ; then 1279 if [[ -n ${CD_ROOT}${CD_ROOT_1} ]] ; then
1335 local var= 1280 local var=
1336 cdcnt=0 1281 cdcnt=0
1337 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1282 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1338 cdcnt=$((cdcnt + 1)) 1283 ((++cdcnt))
1339 var="CD_ROOT_${cdcnt}" 1284 var="CD_ROOT_${cdcnt}"
1285 [[ -z ${!var} ]] && var="CD_ROOT"
1340 if [[ -z ${!var} ]] ; then 1286 if [[ -z ${!var} ]] ; then
1341 eerror "You must either use just the CD_ROOT" 1287 eerror "You must either use just the CD_ROOT"
1342 eerror "or specify ALL the CD_ROOT_X variables." 1288 eerror "or specify ALL the CD_ROOT_X variables."
1343 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables." 1289 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."
1344 die "could not locate CD_ROOT_${cdcnt}" 1290 die "could not locate CD_ROOT_${cdcnt}"
1345 fi 1291 fi
1346 export CDROM_ROOTS_${cdcnt}="${!var}"
1347 done 1292 done
1348 export CDROM_ROOT=${CDROM_ROOTS_1} 1293 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1349 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1294 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1295 export CDROM_SET=-1
1296 for f in ${CDROM_CHECK_1//:/ } ; do
1297 ((++CDROM_SET))
1298 [[ -e ${CD_ROOT}/${f} ]] && break
1299 done
1300 export CDROM_MATCH=${f}
1350 return 1301 return
1351 fi 1302 fi
1352 1303
1304 # User didn't help us out so lets make sure they know they can
1305 # simplify the whole process ...
1353 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1306 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1354 einfon "This ebuild will need the " 1307 einfo "This ebuild will need the ${CDROM_NAME:-cdrom for ${PN}}"
1355 if [[ -z ${CDROM_NAME} ]] ; then
1356 echo "cdrom for ${PN}."
1357 else
1358 echo "${CDROM_NAME}."
1359 fi
1360 echo 1308 echo
1361 einfo "If you do not have the CD, but have the data files" 1309 einfo "If you do not have the CD, but have the data files"
1362 einfo "mounted somewhere on your filesystem, just export" 1310 einfo "mounted somewhere on your filesystem, just export"
1363 einfo "the variable CD_ROOT so that it points to the" 1311 einfo "the variable CD_ROOT so that it points to the"
1364 einfo "directory containing the files." 1312 einfo "directory containing the files."
1365 echo 1313 echo
1366 einfo "For example:" 1314 einfo "For example:"
1367 einfo "export CD_ROOT=/mnt/cdrom" 1315 einfo "export CD_ROOT=/mnt/cdrom"
1368 echo 1316 echo
1369 else 1317 else
1318 if [[ -n ${CDROM_NAME_SET} ]] ; then
1319 # Translate the CDROM_NAME_SET array into CDROM_NAME_#
1320 cdcnt=0
1321 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1322 ((++cdcnt))
1323 export CDROM_NAME_${cdcnt}="${CDROM_NAME_SET[$((${cdcnt}-1))]}"
1324 done
1325 fi
1326
1370 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1327 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1371 cdcnt=0 1328 cdcnt=0
1372 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1329 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1373 cdcnt=$((cdcnt + 1)) 1330 ((++cdcnt))
1374 var="CDROM_NAME_${cdcnt}" 1331 var="CDROM_NAME_${cdcnt}"
1375 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}" 1332 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1376 done 1333 done
1377 echo 1334 echo
1378 einfo "If you do not have the CDs, but have the data files" 1335 einfo "If you do not have the CDs, but have the data files"
1379 einfo "mounted somewhere on your filesystem, just export" 1336 einfo "mounted somewhere on your filesystem, just export"
1380 einfo "the following variables so they point to the right place:" 1337 einfo "the following variables so they point to the right place:"
1381 einfon "" 1338 einfon ""
1382 cdcnt=0 1339 cdcnt=0
1383 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1340 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1384 cdcnt=$((cdcnt + 1)) 1341 ((++cdcnt))
1385 echo -n " CD_ROOT_${cdcnt}" 1342 echo -n " CD_ROOT_${cdcnt}"
1386 done 1343 done
1387 echo 1344 echo
1388 einfo "Or, if you have all the files in the same place, or" 1345 einfo "Or, if you have all the files in the same place, or"
1389 einfo "you only have one cdrom, you can export CD_ROOT" 1346 einfo "you only have one cdrom, you can export CD_ROOT"
1392 echo 1349 echo
1393 einfo "For example:" 1350 einfo "For example:"
1394 einfo "export CD_ROOT_1=/mnt/cdrom" 1351 einfo "export CD_ROOT_1=/mnt/cdrom"
1395 echo 1352 echo
1396 fi 1353 fi
1354
1355 export CDROM_SET=""
1397 export CDROM_CURRENT_CD=0 1356 export CDROM_CURRENT_CD=0
1398 cdrom_load_next_cd 1357 cdrom_load_next_cd
1399} 1358}
1400 1359
1401# this is only used when you need access to more than one cd. 1360# this is only used when you need access to more than one cd.
1402# when you have finished using the first cd, just call this function. 1361# when you have finished using the first cd, just call this function.
1403# when it returns, CDROM_ROOT will be pointing to the second cd. 1362# when it returns, CDROM_ROOT will be pointing to the second cd.
1404# remember, you can only go forward in the cd chain, you can't go back. 1363# remember, you can only go forward in the cd chain, you can't go back.
1405cdrom_load_next_cd() { 1364cdrom_load_next_cd() {
1406 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1407 local var= 1365 local var
1408 1366 ((++CDROM_CURRENT_CD))
1409 if [[ ! -z ${CD_ROOT} ]] ; then
1410 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1411 return
1412 fi
1413 1367
1414 unset CDROM_ROOT 1368 unset CDROM_ROOT
1415 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1369 var=CD_ROOT_${CDROM_CURRENT_CD}
1370 [[ -z ${!var} ]] && var="CD_ROOT"
1416 if [[ -z ${!var} ]] ; then 1371 if [[ -z ${!var} ]] ; then
1417 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1372 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1418 cdrom_locate_file_on_cd ${!var} 1373 _cdrom_locate_file_on_cd ${!var}
1419 else 1374 else
1420 export CDROM_ROOT=${!var} 1375 export CDROM_ROOT=${!var}
1421 fi 1376 fi
1422 1377
1423 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1378 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1428# all it does is try to locate a give file on a cd ... if the cd isn't 1383# all it does is try to locate a give file on a cd ... if the cd isn't
1429# found, then a message asking for the user to insert the cdrom will be 1384# found, then a message asking for the user to insert the cdrom will be
1430# displayed and we'll hang out here until: 1385# displayed and we'll hang out here until:
1431# (1) the file is found on a mounted cdrom 1386# (1) the file is found on a mounted cdrom
1432# (2) the user hits CTRL+C 1387# (2) the user hits CTRL+C
1433cdrom_locate_file_on_cd() { 1388_cdrom_locate_file_on_cd() {
1389 local mline=""
1390 local showedmsg=0
1391
1434 while [[ -z ${CDROM_ROOT} ]] ; do 1392 while [[ -z ${CDROM_ROOT} ]] ; do
1393 local i=0
1394 local -a cdset=(${*//:/ })
1395 if [[ -n ${CDROM_SET} ]] ; then
1396 cdset=(${cdset[${CDROM_SET}]})
1397 fi
1398
1399 while [[ -n ${cdset[${i}]} ]] ; do
1435 local dir="$(dirname ${@})" 1400 local dir=$(dirname ${cdset[${i}]})
1436 local file="$(basename ${@})" 1401 local file=$(basename ${cdset[${i}]})
1437 local mline=""
1438 local showedmsg=0
1439 1402
1440 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1403 for mline in $(mount | gawk '/(iso|cdrom|fs=cdfss)/ {print $3}') ; do
1441 [[ -d ${mline}/${dir} ]] || continue 1404 [[ -d ${mline}/${dir} ]] || continue
1442 [[ ! -z $(find ${mline}/${dir} -iname ${file} -maxdepth 1) ]] \ 1405 if [[ -n $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] ; then
1443 && export CDROM_ROOT=${mline} 1406 export CDROM_ROOT=${mline}
1407 export CDROM_SET=${i}
1408 export CDROM_MATCH=${cdset[${i}]}
1409 return
1410 fi
1411 done
1412
1413 ((++i))
1444 done 1414 done
1445 1415
1446 if [[ -z ${CDROM_ROOT} ]] ; then
1447 echo 1416 echo
1448 if [[ ${showedmsg} -eq 0 ]] ; then 1417 if [[ ${showedmsg} -eq 0 ]] ; then
1449 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1418 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1450 if [[ -z ${CDROM_NAME} ]] ; then 1419 if [[ -z ${CDROM_NAME} ]] ; then
1451 einfo "Please insert the cdrom for ${PN} now !" 1420 einfo "Please insert+mount the cdrom for ${PN} now !"
1452 else
1453 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1454 fi
1455 else 1421 else
1456 if [[ -z ${CDROM_NAME_1} ]] ; then
1457 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1458 else
1459 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1460 einfo "Please insert+mount the ${!var} cdrom now !" 1422 einfo "Please insert+mount the ${CDROM_NAME} cdrom now !"
1461 fi
1462 fi 1423 fi
1463 showedmsg=1 1424 else
1425 if [[ -z ${CDROM_NAME_1} ]] ; then
1426 einfo "Please insert+mount cd #${CDROM_CURRENT_CD} for ${PN} now !"
1427 else
1428 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1429 einfo "Please insert+mount the ${!var} cdrom now !"
1430 fi
1464 fi 1431 fi
1432 showedmsg=1
1433 fi
1465 einfo "Press return to scan for the cd again" 1434 einfo "Press return to scan for the cd again"
1466 einfo "or hit CTRL+C to abort the emerge." 1435 einfo "or hit CTRL+C to abort the emerge."
1467 read 1436 echo
1468 fi 1437 einfo "If you are having trouble with the detection"
1438 einfo "of your CD, it is possible that you do not have"
1439 einfo "Joliet support enabled in your kernel. Please"
1440 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1441 read || die "something is screwed with your system"
1469 done 1442 done
1470} 1443}
1471 1444
1472# Make sure that LINGUAS only contains languages that 1445# Make sure that LINGUAS only contains languages that
1473# a package can support 1446# a package can support
1480# The -i builds a list of po files found in all the 1453# The -i builds a list of po files found in all the
1481# directories and uses the intersection of the lists. 1454# directories and uses the intersection of the lists.
1482# The -u builds a list of po files found in all the 1455# The -u builds a list of po files found in all the
1483# directories and uses the union of the lists. 1456# directories and uses the union of the lists.
1484strip-linguas() { 1457strip-linguas() {
1485 local ls newls 1458 local ls newls nols
1486 if [ "$1" == "-i" ] || [ "$1" == "-u" ] ; then 1459 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1487 local op="$1"; shift 1460 local op=$1; shift
1488 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1461 ls=$(find "$1" -name '*.po' -exec basename {} .po \;); shift
1489 local d f 1462 local d f
1490 for d in "$@" ; do 1463 for d in "$@" ; do
1491 if [ "${op}" == "-u" ] ; then 1464 if [[ ${op} == "-u" ]] ; then
1492 newls="${ls}" 1465 newls=${ls}
1493 else 1466 else
1494 newls="" 1467 newls=""
1495 fi 1468 fi
1496 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1469 for f in $(find "$d" -name '*.po' -exec basename {} .po \;) ; do
1497 if [ "${op}" == "-i" ] ; then 1470 if [[ ${op} == "-i" ]] ; then
1498 [ "${ls/ ${f} /}" != "${ls}" ] && newls="${newls} ${f}" 1471 hasq ${f} ${ls} && newls="${newls} ${f}"
1499 else 1472 else
1500 [ "${ls/ ${f} /}" == "${ls}" ] && newls="${newls} ${f}" 1473 hasq ${f} ${ls} || newls="${newls} ${f}"
1501 fi 1474 fi
1502 done 1475 done
1503 ls="${newls}" 1476 ls=${newls}
1504 done 1477 done
1505 ls="${ls//.po}"
1506 else 1478 else
1507 ls="$@" 1479 ls="$@"
1508 fi 1480 fi
1509 1481
1510 ls=" ${ls} " 1482 nols=""
1511 newls="" 1483 newls=""
1512 for f in ${LINGUAS} ; do 1484 for f in ${LINGUAS} ; do
1513 if [ "${ls/ ${f} /}" != "${ls}" ] ; then 1485 if hasq ${f} ${ls} ; then
1514 newls="${newls} ${f}" 1486 newls="${newls} ${f}"
1515 else 1487 else
1516 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1488 nols="${nols} ${f}"
1517 fi 1489 fi
1518 done 1490 done
1519 if [ -z "${newls}" ] ; then 1491 [[ -n ${nols} ]] \
1520 unset LINGUAS 1492 && ewarn "Sorry, but ${PN} does not support the LINGUAs:" ${nols}
1521 else
1522 export LINGUAS="${newls}" 1493 export LINGUAS=${newls:1}
1523 fi
1524} 1494}
1525 1495
1526# moved from kernel.eclass since they are generally useful outside of 1496# moved from kernel.eclass since they are generally useful outside of
1527# kernel.eclass -iggy (20041002) 1497# kernel.eclass -iggy (20041002)
1528 1498
1535 while ((i--)) ; do 1505 while ((i--)) ; do
1536 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass" 1506 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1537 done 1507 done
1538 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1508 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1539 case ${ARCH} in 1509 case ${ARCH} in
1540 x86) export ARCH="i386";; 1510 x86) export ARCH="i386";;
1541 amd64) export ARCH="x86_64";; 1511 amd64) export ARCH="x86_64";;
1542 hppa) export ARCH="parisc";; 1512 hppa) export ARCH="parisc";;
1543 mips) export ARCH="mips";; 1513 mips) export ARCH="mips";;
1544 sparc) export ARCH="$(tc-arch-kernel)";; # Yeah this is ugly, but it's even WORSE if you don't do this. linux-info.eclass's set_arch_to_kernel is fixed, but won't get used over this one! 1514 sparc) export ARCH="$(tc-arch-kernel)";; # Yeah this is ugly, but it's even WORSE if you don't do this. linux-info.eclass's set_arch_to_kernel is fixed, but won't get used over this one!
1545 *) export ARCH="${ARCH}";; 1515 *) export ARCH="${ARCH}";;
1546 esac 1516 esac
1547} 1517}
1548 1518
1549# set's ARCH back to what portage expects 1519# set's ARCH back to what portage expects
1550set_arch_to_portage() { 1520set_arch_to_portage() {
1557 1527
1558# Jeremy Huddleston <eradicator@gentoo.org>: 1528# Jeremy Huddleston <eradicator@gentoo.org>:
1559# preserve_old_lib /path/to/libblah.so.0 1529# preserve_old_lib /path/to/libblah.so.0
1560# preserve_old_lib_notify /path/to/libblah.so.0 1530# preserve_old_lib_notify /path/to/libblah.so.0
1561# 1531#
1562# These functions are useful when a lib in your package changes --soname. Such 1532# These functions are useful when a lib in your package changes --library. Such
1563# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0 1533# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0
1564# would break packages that link against it. Most people get around this 1534# would break packages that link against it. Most people get around this
1565# by using the portage SLOT mechanism, but that is not always a relevant 1535# by using the portage SLOT mechanism, but that is not always a relevant
1566# solution, so instead you can add the following to your ebuilds: 1536# solution, so instead you can add the following to your ebuilds:
1567# 1537#
1594 LIB=$1 1564 LIB=$1
1595 1565
1596 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1566 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1597 SONAME=`basename ${LIB}` 1567 SONAME=`basename ${LIB}`
1598 1568
1599 einfo "An old version of an installed library was detected on your system." 1569 ewarn "An old version of an installed library was detected on your system."
1600 einfo "In order to avoid breaking packages that link against is, this older version" 1570 ewarn "In order to avoid breaking packages that link against it, this older version"
1601 einfo "is not being removed. In order to make full use of this newer version," 1571 ewarn "is not being removed. In order to make full use of this newer version,"
1602 einfo "you will need to execute the following command:" 1572 ewarn "you will need to execute the following command:"
1603 einfo " revdep-rebuild --soname ${SONAME}" 1573 ewarn " revdep-rebuild --library ${SONAME}"
1604 einfo 1574 ewarn
1605 einfo "After doing that, you can safely remove ${LIB}" 1575 ewarn "After doing that, you can safely remove ${LIB}"
1606 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1576 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1607 fi 1577 fi
1608} 1578}
1609 1579
1610# Hack for people to figure out if a package was built with 1580# Hack for people to figure out if a package was built with
1611# certain USE flags 1581# certain USE flags
1619built_with_use() { 1589built_with_use() {
1620 local opt=$1 1590 local opt=$1
1621 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1591 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1622 1592
1623 local PKG=$(best_version $1) 1593 local PKG=$(best_version $1)
1594 [[ -z ${PKG} ]] && die "Unable to resolve $1 to an installed package"
1624 shift 1595 shift
1625 1596
1626 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE" 1597 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
1627 [[ ! -e ${USEFILE} ]] && return 1 1598
1599 # if the USE file doesnt exist, assume the $PKG is either
1600 # injected or package.provided
1601 [[ ! -e ${USEFILE} ]] && die "Unable to determine what USE flags $PKG was built with"
1628 1602
1629 local USE_BUILT=$(<${USEFILE}) 1603 local USE_BUILT=$(<${USEFILE})
1630 while [[ $# -gt 0 ]] ; do 1604 while [[ $# -gt 0 ]] ; do
1631 if [[ ${opt} = "-o" ]] ; then 1605 if [[ ${opt} = "-o" ]] ; then
1632 has $1 ${USE_BUILT} && return 0 1606 has $1 ${USE_BUILT} && return 0
1657dopamd() { 1631dopamd() {
1658 [[ -z $1 ]] && die "dopamd requires at least one argument" 1632 [[ -z $1 ]] && die "dopamd requires at least one argument"
1659 1633
1660 use pam || return 0 1634 use pam || return 0
1661 1635
1662 insinto /etc/pam.d 1636 INSDESTTREE=/etc/pam.d \
1663 # these are the default doins options, but be explicit just in case
1664 insopts -m 0644 -o root -g root
1665 doins "$@" || die "failed to install $@" 1637 doins "$@" || die "failed to install $@"
1666} 1638}
1667# newpamd <old name> <new name> 1639# newpamd <old name> <new name>
1668# 1640#
1669# Install pam file <old name> as <new name> in /etc/pam.d 1641# Install pam file <old name> as <new name> in /etc/pam.d
1670newpamd() { 1642newpamd() {
1671 [[ $# -ne 2 ]] && die "newpamd requires two arguements" 1643 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1672 1644
1673 use pam || return 0 1645 use pam || return 0
1674 1646
1675 insinto /etc/pam.d 1647 INSDESTTREE=/etc/pam.d \
1676 # these are the default doins options, but be explicit just in case
1677 insopts -m 0644 -o root -g root
1678 newins "$1" "$2" || die "failed to install $1 as $2" 1648 newins "$1" "$2" || die "failed to install $1 as $2"
1679} 1649}
1650
1651# make a wrapper script ...
1652# NOTE: this was originally games_make_wrapper, but I noticed other places where
1653# this could be used, so I have moved it here and made it not games-specific
1654# -- wolf31o2
1655# $1 == wrapper name
1656# $2 == binary to run
1657# $3 == directory to chdir before running binary
1658# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1659# $5 == path for wrapper
1660make_wrapper() {
1661 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1662 local tmpwrapper=$(emktemp)
1663 # We don't want to quote ${bin} so that people can pass complex
1664 # things as $bin ... "./someprog --args"
1665 cat << EOF > "${tmpwrapper}"
1666#!/bin/sh
1667cd "${chdir:-.}"
1668if [ -n "${libdir}" ] ; then
1669 if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
1670 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1671 else
1672 export LD_LIBRARY_PATH="${libdir}"
1673 fi
1674fi
1675exec ${bin} "\$@"
1676EOF
1677 chmod go+rx "${tmpwrapper}"
1678 if [[ -n ${path} ]] ; then
1679 exeinto "${path}"
1680 newexe "${tmpwrapper}" "${wrapper}"
1681 else
1682 newbin "${tmpwrapper}" "${wrapper}"
1683 fi
1684}

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

  ViewVC Help
Powered by ViewVC 1.1.20