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

Diff of /eclass/eutils.eclass

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

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

Legend:
Removed from v.1.145  
changed lines
  Added in v.1.245

  ViewVC Help
Powered by ViewVC 1.1.20