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

Legend:
Removed from v.1.144  
changed lines
  Added in v.1.256

  ViewVC Help
Powered by ViewVC 1.1.20