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

Diff of /eclass/eutils.eclass

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

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

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

  ViewVC Help
Powered by ViewVC 1.1.20