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

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

  ViewVC Help
Powered by ViewVC 1.1.20