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

Diff of /eclass/eutils.eclass

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

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

  ViewVC Help
Powered by ViewVC 1.1.20