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

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

  ViewVC Help
Powered by ViewVC 1.1.20