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

Diff of /eclass/eutils.eclass

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

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

Legend:
Removed from v.1.145  
changed lines
  Added in v.1.237

  ViewVC Help
Powered by ViewVC 1.1.20