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

Diff of /eclass/eutils.eclass

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

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

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

  ViewVC Help
Powered by ViewVC 1.1.20