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

Diff of /eclass/eutils.eclass

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

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

  ViewVC Help
Powered by ViewVC 1.1.20