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

Diff of /eclass/eutils.eclass

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

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

  ViewVC Help
Powered by ViewVC 1.1.20