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

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

  ViewVC Help
Powered by ViewVC 1.1.20