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

Diff of /eclass/eutils.eclass

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

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

Legend:
Removed from v.1.146  
changed lines
  Added in v.1.252

  ViewVC Help
Powered by ViewVC 1.1.20