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

Diff of /eclass/eutils.eclass

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

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

  ViewVC Help
Powered by ViewVC 1.1.20