/[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.233
1# Copyright 1999-2004 Gentoo Foundation 1# Copyright 1999-2005 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.144 2005/02/03 22:11:33 chriswhite Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.233 2006/04/19 03:53:19 vapier Exp $
4# 4#
5# Author: Martin Schlemmer <azarah@gentoo.org> 5# Author: Martin Schlemmer <azarah@gentoo.org>
6# 6#
7# This eclass is for general purpose functions that most ebuilds 7# This eclass is for general purpose functions that most ebuilds
8# have to implement themselves. 8# have to implement themselves.
9# 9#
10# NB: If you add anything, please comment it! 10# NB: If you add anything, please comment it!
11 11
12inherit multilib 12inherit multilib portability
13ECLASS=eutils
14INHERITED="$INHERITED $ECLASS"
15 13
16DEPEND="!bootstrap? ( sys-devel/patch )" 14DEPEND="!bootstrap? ( sys-devel/patch )"
15RDEPEND=""
16# sys-apps/shadow is needed for useradd, etc, bug #94745.
17 17
18DESCRIPTION="Based on the ${ECLASS} eclass" 18DESCRIPTION="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 19
57# Wait for the supplied number of seconds. If no argument is supplied, defaults 20# 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 21# 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 22# outputting to a terminal, don't wait. For compatability purposes, the argument
60# must be an integer greater than zero. 23# must be an integer greater than zero.
98# to point to the latest version of the library present. 61# to point to the latest version of the library present.
99# 62#
100# <azarah@gentoo.org> (26 Oct 2002) 63# <azarah@gentoo.org> (26 Oct 2002)
101# 64#
102gen_usr_ldscript() { 65gen_usr_ldscript() {
103 local libdir="$(get_libdir)" 66 local lib libdir=$(get_libdir)
104 # Just make sure it exists 67 # Just make sure it exists
105 dodir /usr/${libdir} 68 dodir /usr/${libdir}
106 69
70 for lib in "${@}" ; do
107 cat > "${D}/usr/${libdir}/${1}" << END_LDSCRIPT 71 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT
108/* GNU ld script 72 /* GNU ld script
109 Because Gentoo have critical dynamic libraries 73 Since Gentoo has critical dynamic libraries
110 in /lib, and the static versions in /usr/lib, we 74 in /lib, and the static versions in /usr/lib,
111 need to have a "fake" dynamic lib in /usr/lib, 75 we need to have a "fake" dynamic lib in /usr/lib,
112 otherwise we run into linking problems. 76 otherwise we run into linking problems.
113 See bug #4411 on http://bugs.gentoo.org/ for 77
114 more info. */ 78 See bug http://bugs.gentoo.org/4411 for more info.
79 */
115GROUP ( /${libdir}/${1} ) 80 GROUP ( /${libdir}/${lib} )
116END_LDSCRIPT 81 END_LDSCRIPT
117 fperms a+x "/usr/${libdir}/${1}" 82 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 83 done
144
145 echo
146
147 return 0
148} 84}
85
149 86
150# Default directory where patches are located 87# Default directory where patches are located
151EPATCH_SOURCE="${WORKDIR}/patch" 88EPATCH_SOURCE="${WORKDIR}/patch"
152# Default extension for patches 89# Default extension for patches
153EPATCH_SUFFIX="patch.bz2" 90EPATCH_SUFFIX="patch.bz2"
154# Default options for patch 91# Default options for patch
155# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571 92# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571
156EPATCH_OPTS="-g0" 93# Set --no-backup-if-mismatch so we don't leave '.orig' files behind.
94# Set -E to automatically remove empty files.
95EPATCH_OPTS="-g0 -E --no-backup-if-mismatch"
157# List of patches not to apply. Not this is only file names, 96# List of patches not to apply. Not this is only file names,
158# and not the full path .. 97# and not the full path ..
159EPATCH_EXCLUDE="" 98EPATCH_EXCLUDE=""
160# Change the printed message for a single patch. 99# Change the printed message for a single patch.
161EPATCH_SINGLE_MSG="" 100EPATCH_SINGLE_MSG=""
101# Change the printed message for multiple patches.
102EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..."
162# Force applying bulk patches even if not following the style: 103# Force applying bulk patches even if not following the style:
163# 104#
164# ??_${ARCH}_foo.${EPATCH_SUFFIX} 105# ??_${ARCH}_foo.${EPATCH_SUFFIX}
165# 106#
166EPATCH_FORCE="no" 107EPATCH_FORCE="no"
197# hand its a directory, it will set EPATCH_SOURCE to this. 138# hand its a directory, it will set EPATCH_SOURCE to this.
198# 139#
199# <azarah@gentoo.org> (10 Nov 2002) 140# <azarah@gentoo.org> (10 Nov 2002)
200# 141#
201epatch() { 142epatch() {
143 _epatch_draw_line() {
144 [[ -z $1 ]] && set "$(printf "%65s" '')"
145 echo "${1//?/=}"
146 }
147 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; }
202 local PIPE_CMD="" 148 local PIPE_CMD=""
203 local STDERR_TARGET="${T}/$$.out" 149 local STDERR_TARGET="${T}/$$.out"
204 local PATCH_TARGET="${T}/$$.patch" 150 local PATCH_TARGET="${T}/$$.patch"
205 local PATCH_SUFFIX="" 151 local PATCH_SUFFIX=""
206 local SINGLE_PATCH="no" 152 local SINGLE_PATCH="no"
207 local x="" 153 local x=""
208 154
155 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
156
209 if [ "$#" -gt 1 ] 157 if [ "$#" -gt 1 ]
210 then 158 then
211 local m="" 159 local m=""
212 einfo "${#} patches to apply ..."
213 for m in "$@" ; do 160 for m in "$@" ; do
214 epatch "${m}" 161 epatch "${m}"
215 done 162 done
216 return 0 163 return 0
217 fi 164 fi
271 ;; 218 ;;
272 esac 219 esac
273 220
274 if [ "${SINGLE_PATCH}" = "no" ] 221 if [ "${SINGLE_PATCH}" = "no" ]
275 then 222 then
276 einfo "Applying various patches (bugfixes/updates) ..." 223 einfo "${EPATCH_MULTI_MSG}"
277 fi 224 fi
278 for x in ${EPATCH_SOURCE} 225 for x in ${EPATCH_SOURCE}
279 do 226 do
280 # New ARCH dependant patch naming scheme ... 227 # New ARCH dependant patch naming scheme ...
281 # 228 #
282 # ???_arch_foo.patch 229 # ???_arch_foo.patch
283 # 230 #
284 if [ -f ${x} ] && \ 231 if [ -f ${x} ] && \
285 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "`eval echo \$\{x/_${ARCH}_\}`" != "${x}" ] || \ 232 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "${x/_${ARCH}_}" != "${x}" ] || \
286 [ "${EPATCH_FORCE}" = "yes" ]) 233 [ "${EPATCH_FORCE}" = "yes" ])
287 then 234 then
288 local count=0 235 local count=0
289 local popts="${EPATCH_OPTS}" 236 local popts="${EPATCH_OPTS}"
237 local patchname=${x##*/}
290 238
291 if [ -n "${EPATCH_EXCLUDE}" ] 239 if [ -n "${EPATCH_EXCLUDE}" ]
292 then 240 then
293 if [ "`eval echo \$\{EPATCH_EXCLUDE/${x##*/}\}`" != "${EPATCH_EXCLUDE}" ] 241 if [ "${EPATCH_EXCLUDE/${patchname}}" != "${EPATCH_EXCLUDE}" ]
294 then 242 then
295 continue 243 continue
296 fi 244 fi
297 fi 245 fi
298 246
300 then 248 then
301 if [ -n "${EPATCH_SINGLE_MSG}" ] 249 if [ -n "${EPATCH_SINGLE_MSG}" ]
302 then 250 then
303 einfo "${EPATCH_SINGLE_MSG}" 251 einfo "${EPATCH_SINGLE_MSG}"
304 else 252 else
305 einfo "Applying ${x##*/} ..." 253 einfo "Applying ${patchname} ..."
306 fi 254 fi
307 else 255 else
308 einfo " ${x##*/} ..." 256 einfo " ${patchname} ..."
309 fi 257 fi
310 258
311 echo "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 259 echo "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
312 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 260 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
313 261
314 # Allow for prefix to differ ... im lazy, so shoot me :/ 262 # Allow for prefix to differ ... im lazy, so shoot me :/
315 while [ "${count}" -lt 5 ] 263 while [ "${count}" -lt 5 ]
316 do 264 do
317 # Generate some useful debug info ... 265 # Generate some useful debug info ...
318 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 266 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
319 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 267 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
320 268
321 if [ "${PATCH_SUFFIX}" != "patch" ] 269 if [ "${PATCH_SUFFIX}" != "patch" ]
322 then 270 then
323 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 271 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
324 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 272 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
325 else 273 else
326 PATCH_TARGET="${x}" 274 PATCH_TARGET="${x}"
327 fi 275 fi
328 276
329 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 277 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
330 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 278 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
331 279
332 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 280 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
333 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 281 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
334 282
335 if [ "${PATCH_SUFFIX}" != "patch" ] 283 if [ "${PATCH_SUFFIX}" != "patch" ]
336 then 284 then
337 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1 285 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
338 then 286 then
339 echo 287 echo
340 eerror "Could not extract patch!" 288 eerror "Could not extract patch!"
341 #die "Could not extract patch!" 289 #die "Could not extract patch!"
342 count=5 290 count=5
343 break 291 break
344 fi 292 fi
345 fi 293 fi
346 294
347 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1 295 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f ; _epatch_assert) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
348 then 296 then
349 draw_line "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 297 _epatch_draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
350 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 298 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
351 echo "ACTUALLY APPLYING ${x##*/} ..." >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 299 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
352 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 300 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
353 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 301 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
354 302
355 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 2>&1 303 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
304 _epatch_assert
356 305
357 if [ "$?" -ne 0 ] 306 if [ "$?" -ne 0 ]
358 then 307 then
359 cat ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 308 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
360 echo 309 echo
361 eerror "A dry-run of patch command succeeded, but actually" 310 eerror "A dry-run of patch command succeeded, but actually"
362 eerror "applying the patch failed!" 311 eerror "applying the patch failed!"
363 #die "Real world sux compared to the dreamworld!" 312 #die "Real world sux compared to the dreamworld!"
364 count=5 313 count=5
365 fi 314 fi
366 315
367 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 316 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
368 317
369 break 318 break
370 fi 319 fi
371 320
372 count=$((count + 1)) 321 count=$((count + 1))
378 fi 327 fi
379 328
380 if [ "${count}" -eq 5 ] 329 if [ "${count}" -eq 5 ]
381 then 330 then
382 echo 331 echo
383 eerror "Failed Patch: ${x##*/}!" 332 eerror "Failed Patch: ${patchname} !"
333 eerror " ( ${PATCH_TARGET} )"
384 eerror 334 eerror
385 eerror "Include in your bugreport the contents of:" 335 eerror "Include in your bugreport the contents of:"
386 eerror 336 eerror
387 eerror " ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}" 337 eerror " ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}"
388 echo 338 echo
389 die "Failed Patch: ${x##*/}!" 339 die "Failed Patch: ${patchname}!"
390 fi 340 fi
391 341
392 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 342 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
393 343
394 eend 0 344 eend 0
395 fi 345 fi
396 done 346 done
397 if [ "${SINGLE_PATCH}" = "no" ] 347 if [ "${SINGLE_PATCH}" = "no" ]
398 then 348 then
399 einfo "Done with patching" 349 einfo "Done with patching"
400 fi 350 fi
401} 351}
402 352
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) 353# Cheap replacement for when debianutils (and thus mktemp)
530# does not exist on the users system 354# does not exist on the users system
531# vapier@gentoo.org 355# vapier@gentoo.org
532# 356#
533# Takes just 1 optional parameter (the directory to create tmpfile in) 357# Takes just 1 optional parameter (the directory to create tmpfile in)
534emktemp() { 358emktemp() {
535 local exe="touch" 359 local exe="touch"
536 [ "$1" == "-d" ] && exe="mkdir" && shift 360 [[ $1 == -d ]] && exe="mkdir" && shift
537 local topdir="$1" 361 local topdir=$1
538 362
539 if [ -z "${topdir}" ] 363 if [[ -z ${topdir} ]] ; then
540 then
541 [ -z "${T}" ] \ 364 [[ -z ${T} ]] \
542 && topdir="/tmp" \ 365 && topdir="/tmp" \
543 || topdir="${T}" 366 || topdir=${T}
544 fi 367 fi
545 368
546 if [ -z "$(type -p mktemp)" ] 369 if [[ -z $(type -p mktemp) ]] ; then
547 then
548 local tmp=/ 370 local tmp=/
549 while [ -e "${tmp}" ] ; do 371 while [[ -e ${tmp} ]] ; do
550 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 372 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
551 done 373 done
552 ${exe} "${tmp}" 374 ${exe} "${tmp}" || ${exe} -p "${tmp}"
553 echo "${tmp}" 375 echo "${tmp}"
554 else 376 else
555 [ "${exe}" == "touch" ] \ 377 if [[ ${exe} == "touch" ]] ; then
556 && exe="-p" \ 378 [[ ${USERLAND} == "GNU" ]] \
557 || exe="-d" 379 && mktemp -p "${topdir}" \
558 mktemp ${exe} "${topdir}" 380 || TMPDIR="${topdir}" mktemp -t tmp
381 else
382 [[ ${USERLAND} == "GNU" ]] \
383 && mktemp -d "${topdir}" \
384 || TMPDIR="${topdir}" mktemp -dt tmp
385 fi
559 fi 386 fi
560} 387}
561 388
562# Small wrapper for getent (Linux), nidump (Mac OS X), 389# Small wrapper for getent (Linux), nidump (Mac OS X),
563# and pw (FreeBSD) used in enewuser()/enewgroup() 390# and pw (FreeBSD) used in enewuser()/enewgroup()
564# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 391# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
565# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 392# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
566# 393#
567# egetent(database, key) 394# egetent(database, key)
568egetent() { 395egetent() {
569 if useq ppc-macos ; then 396 case ${CHOST} in
397 *-darwin*)
570 case "$2" in 398 case "$2" in
571 *[!0-9]*) # Non numeric 399 *[!0-9]*) # Non numeric
572 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 400 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
573 ;; 401 ;;
574 *) # Numeric 402 *) # Numeric
575 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 403 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
576 ;; 404 ;;
577 esac 405 esac
578 elif useq x86-fbsd ; then 406 ;;
579 local action 407 *-freebsd*|*-dragonfly*)
580 if [ "$1" == "passwd" ] 408 local opts action="user"
581 then 409 [[ $1 == "passwd" ]] || action="group"
582 action="user" 410
583 else 411 # lookup by uid/gid
584 action="group" 412 if [[ $2 == [[:digit:]]* ]] ; then
413 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
585 fi 414 fi
415
586 pw show "${action}" "$2" -q 416 pw show ${action} ${opts} "$2" -q
587 else 417 ;;
418 *-netbsd*|*-openbsd*)
419 grep "$2:\*:" /etc/$1
420 ;;
421 *)
588 which nscd >& /dev/null && nscd -i "$1" 422 type -p nscd >& /dev/null && nscd -i "$1"
589 getent "$1" "$2" 423 getent "$1" "$2"
590 fi 424 ;;
425 esac
591} 426}
592 427
593# Simplify/standardize adding users to the system 428# Simplify/standardize adding users to the system
594# vapier@gentoo.org 429# vapier@gentoo.org
595# 430#
602# shell: /bin/false 437# shell: /bin/false
603# homedir: /dev/null 438# homedir: /dev/null
604# groups: none 439# groups: none
605# extra: comment of 'added by portage for ${PN}' 440# extra: comment of 'added by portage for ${PN}'
606enewuser() { 441enewuser() {
442 case ${EBUILD_PHASE} in
443 unpack|compile|test|install)
444 eerror "'enewuser()' called from '${EBUILD_PHASE}()' which is not a pkg_* function."
445 eerror "Package fails at QA and at life. Please file a bug."
446 die "Bad package! enewuser is only for use in pkg_* functions!"
447 esac
448
607 # get the username 449 # get the username
608 local euser="$1"; shift 450 local euser=$1; shift
609 if [ -z "${euser}" ] 451 if [[ -z ${euser} ]] ; then
610 then
611 eerror "No username specified !" 452 eerror "No username specified !"
612 die "Cannot call enewuser without a username" 453 die "Cannot call enewuser without a username"
613 fi 454 fi
614 455
615 # lets see if the username already exists 456 # lets see if the username already exists
616 if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ] 457 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then
617 then
618 return 0 458 return 0
619 fi 459 fi
620 einfo "Adding user '${euser}' to your system ..." 460 einfo "Adding user '${euser}' to your system ..."
621 461
622 # options to pass to useradd 462 # options to pass to useradd
623 local opts= 463 local opts=
624 464
625 # handle uid 465 # handle uid
626 local euid="$1"; shift 466 local euid=$1; shift
627 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] 467 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then
628 then
629 if [ "${euid}" -gt 0 ] 468 if [[ ${euid} -gt 0 ]] ; then
630 then
631 if [ ! -z "`egetent passwd ${euid}`" ] 469 if [[ ! -z $(egetent passwd ${euid}) ]] ; then
632 then
633 euid="next" 470 euid="next"
634 fi 471 fi
635 else 472 else
636 eerror "Userid given but is not greater than 0 !" 473 eerror "Userid given but is not greater than 0 !"
637 die "${euid} is not a valid UID" 474 die "${euid} is not a valid UID"
638 fi 475 fi
639 else 476 else
640 euid="next" 477 euid="next"
641 fi 478 fi
642 if [ "${euid}" == "next" ] 479 if [[ ${euid} == "next" ]] ; then
643 then 480 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 481 [[ -z $(egetent passwd ${euid}) ]] && break
652 done 482 done
653 fi 483 fi
654 opts="${opts} -u ${euid}" 484 opts="${opts} -u ${euid}"
655 einfo " - Userid: ${euid}" 485 einfo " - Userid: ${euid}"
656 486
657 # handle shell 487 # handle shell
658 local eshell="$1"; shift 488 local eshell=$1; shift
659 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ] 489 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
660 then 490 if [[ ! -e ${ROOT}${eshell} ]] ; then
661 if [ ! -e "${eshell}" ]
662 then
663 eerror "A shell was specified but it does not exist !" 491 eerror "A shell was specified but it does not exist !"
664 die "${eshell} does not exist" 492 die "${eshell} does not exist in ${ROOT}"
665 fi 493 fi
666 else 494 if [[ ${eshell} == */false || ${eshell} == */nologin ]] ; then
667 if [ "${USERLAND}" == "BSD" ] 495 eerror "Do not specify ${eshell} yourself, use -1"
668 then 496 die "Pass '-1' as the shell parameter"
669 eshell="/usr/bin/false" 497 fi
670 else 498 else
671 eshell="/bin/false" 499 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
500 [[ -x ${ROOT}${shell} ]] && break
501 done
502
503 if [[ ${shell} == "/dev/null" ]] ; then
504 eerror "Unable to identify the shell to use"
505 die "Unable to identify the shell to use"
672 fi 506 fi
507
508 eshell=${shell}
673 fi 509 fi
674 einfo " - Shell: ${eshell}" 510 einfo " - Shell: ${eshell}"
675 opts="${opts} -s ${eshell}" 511 opts="${opts} -s ${eshell}"
676 512
677 # handle homedir 513 # handle homedir
678 local ehome="$1"; shift 514 local ehome=$1; shift
679 if [ -z "${ehome}" ] && [ "${eshell}" != "-1" ] 515 if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then
680 then
681 ehome="/dev/null" 516 ehome="/dev/null"
682 fi 517 fi
683 einfo " - Home: ${ehome}" 518 einfo " - Home: ${ehome}"
684 opts="${opts} -d ${ehome}" 519 opts="${opts} -d ${ehome}"
685 520
686 # handle groups 521 # handle groups
687 local egroups="$1"; shift 522 local egroups=$1; shift
688 if [ ! -z "${egroups}" ] 523 if [[ ! -z ${egroups} ]] ; then
689 then
690 local oldifs="${IFS}" 524 local oldifs=${IFS}
691 local defgroup="" exgroups="" 525 local defgroup="" exgroups=""
692 526
693 export IFS="," 527 export IFS=","
694 for g in ${egroups} 528 for g in ${egroups} ; do
695 do
696 export IFS="${oldifs}" 529 export IFS=${oldifs}
697 if [ -z "`egetent group \"${g}\"`" ] 530 if [[ -z $(egetent group "${g}") ]] ; then
698 then
699 eerror "You must add group ${g} to the system first" 531 eerror "You must add group ${g} to the system first"
700 die "${g} is not a valid GID" 532 die "${g} is not a valid GID"
701 fi 533 fi
702 if [ -z "${defgroup}" ] 534 if [[ -z ${defgroup} ]] ; then
703 then
704 defgroup="${g}" 535 defgroup=${g}
705 else 536 else
706 exgroups="${exgroups},${g}" 537 exgroups="${exgroups},${g}"
707 fi 538 fi
708 export IFS="," 539 export IFS=","
709 done 540 done
710 export IFS="${oldifs}" 541 export IFS=${oldifs}
711 542
712 opts="${opts} -g ${defgroup}" 543 opts="${opts} -g ${defgroup}"
713 if [ ! -z "${exgroups}" ] 544 if [[ ! -z ${exgroups} ]] ; then
714 then
715 opts="${opts} -G ${exgroups:1}" 545 opts="${opts} -G ${exgroups:1}"
716 fi 546 fi
717 else 547 else
718 egroups="(none)" 548 egroups="(none)"
719 fi 549 fi
720 einfo " - Groups: ${egroups}" 550 einfo " - Groups: ${egroups}"
721 551
722 # handle extra and add the user 552 # handle extra and add the user
723 local eextra="$@"
724 local oldsandbox="${SANDBOX_ON}" 553 local oldsandbox=${SANDBOX_ON}
725 export SANDBOX_ON="0" 554 export SANDBOX_ON="0"
726 if useq ppc-macos 555 case ${CHOST} in
727 then 556 *-darwin*)
728 ### Make the user 557 ### Make the user
729 if [ -z "${eextra}" ] 558 if [[ -z $@ ]] ; then
730 then
731 dscl . create /users/${euser} uid ${euid} 559 dscl . create /users/${euser} uid ${euid}
732 dscl . create /users/${euser} shell ${eshell} 560 dscl . create /users/${euser} shell ${eshell}
733 dscl . create /users/${euser} home ${ehome} 561 dscl . create /users/${euser} home ${ehome}
734 dscl . create /users/${euser} realname "added by portage for ${PN}" 562 dscl . create /users/${euser} realname "added by portage for ${PN}"
735 ### Add the user to the groups specified 563 ### Add the user to the groups specified
736 local oldifs="${IFS}" 564 local oldifs=${IFS}
737 export IFS="," 565 export IFS=","
738 for g in ${egroups} 566 for g in ${egroups} ; do
739 do
740 dscl . merge /groups/${g} users ${euser} 567 dscl . merge /groups/${g} users ${euser}
741 done 568 done
742 export IFS="${oldifs}" 569 export IFS=${oldifs}
743 else 570 else
744 einfo "Extra options are not supported on macos yet" 571 einfo "Extra options are not supported on Darwin yet"
745 einfo "Please report the ebuild along with the info below" 572 einfo "Please report the ebuild along with the info below"
746 einfo "eextra: ${eextra}" 573 einfo "eextra: $@"
747 die "Required function missing" 574 die "Required function missing"
748 fi 575 fi
749 elif use x86-fbsd ; then 576 ;;
750 if [ -z "${eextra}" ] 577 *-freebsd*|*-dragonfly*)
751 then 578 if [[ -z $@ ]] ; then
752 pw useradd ${euser} ${opts} \ 579 pw useradd ${euser} ${opts} \
753 -c "added by portage for ${PN}" \ 580 -c "added by portage for ${PN}" \
754 die "enewuser failed" 581 die "enewuser failed"
755 else 582 else
756 einfo " - Extra: ${eextra}" 583 einfo " - Extra: $@"
757 pw useradd ${euser} ${opts} \ 584 pw useradd ${euser} ${opts} \
758 -c ${eextra} || die "enewuser failed" 585 "$@" || die "enewuser failed"
759 fi 586 fi
587 ;;
588
589 *-netbsd*)
590 if [[ -z $@ ]] ; then
591 useradd ${opts} ${euser} || die "enewuser failed"
760 else 592 else
761 if [ -z "${eextra}" ] 593 einfo " - Extra: $@"
762 then 594 useradd ${opts} ${euser} "$@" || die "enewuser failed"
595 fi
596 ;;
597
598 *-openbsd*)
599 if [[ -z $@ ]] ; then
600 useradd -u ${euid} -s ${eshell} \
601 -d ${ehome} -c "Added by portage for ${PN}" \
602 -g ${egroups} ${euser} || die "enewuser failed"
603 else
604 einfo " - Extra: $@"
605 useradd -u ${euid} -s ${eshell} \
606 -d ${ehome} -c "Added by portage for ${PN}" \
607 -g ${egroups} ${euser} "$@" || die "enewuser failed"
608 fi
609 ;;
610
611 *)
612 if [[ -z $@ ]] ; then
763 useradd ${opts} ${euser} \ 613 useradd ${opts} ${euser} \
764 -c "added by portage for ${PN}" \ 614 -c "added by portage for ${PN}" \
765 || die "enewuser failed" 615 || die "enewuser failed"
766 else 616 else
767 einfo " - Extra: ${eextra}" 617 einfo " - Extra: $@"
768 useradd ${opts} ${euser} ${eextra} \ 618 useradd ${opts} ${euser} "$@" \
769 || die "enewuser failed" 619 || die "enewuser failed"
770 fi 620 fi
621 ;;
622 esac
623
624 if [[ ! -e ${ROOT}/${ehome} ]] ; then
625 einfo " - Creating ${ehome} in ${ROOT}"
626 mkdir -p "${ROOT}/${ehome}"
627 chown ${euser} "${ROOT}/${ehome}"
628 chmod 755 "${ROOT}/${ehome}"
771 fi 629 fi
630
772 export SANDBOX_ON="${oldsandbox}" 631 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} 632}
782 633
783# Simplify/standardize adding groups to the system 634# Simplify/standardize adding groups to the system
784# vapier@gentoo.org 635# vapier@gentoo.org
785# 636#
788# Default values if you do not specify any: 639# Default values if you do not specify any:
789# groupname: REQUIRED ! 640# groupname: REQUIRED !
790# gid: next available (see groupadd(8)) 641# gid: next available (see groupadd(8))
791# extra: none 642# extra: none
792enewgroup() { 643enewgroup() {
644 case ${EBUILD_PHASE} in
645 unpack|compile|test|install)
646 eerror "'enewgroup()' called from '${EBUILD_PHASE}()' which is not a pkg_* function."
647 eerror "Package fails at QA and at life. Please file a bug."
648 die "Bad package! enewgroup is only for use in pkg_* functions!"
649 esac
650
793 # get the group 651 # get the group
794 local egroup="$1"; shift 652 local egroup="$1"; shift
795 if [ -z "${egroup}" ] 653 if [ -z "${egroup}" ]
796 then 654 then
797 eerror "No group specified !" 655 eerror "No group specified !"
814 then 672 then
815 if [ "${egid}" -gt 0 ] 673 if [ "${egid}" -gt 0 ]
816 then 674 then
817 if [ -z "`egetent group ${egid}`" ] 675 if [ -z "`egetent group ${egid}`" ]
818 then 676 then
819 if useq ppc-macos ; then 677 if [[ "${CHOST}" == *-darwin* ]]; then
820 opts="${opts} ${egid}" 678 opts="${opts} ${egid}"
821 else 679 else
822 opts="${opts} -g ${egid}" 680 opts="${opts} -g ${egid}"
823 fi 681 fi
824 else 682 else
838 opts="${opts} ${eextra}" 696 opts="${opts} ${eextra}"
839 697
840 # add the group 698 # add the group
841 local oldsandbox="${SANDBOX_ON}" 699 local oldsandbox="${SANDBOX_ON}"
842 export SANDBOX_ON="0" 700 export SANDBOX_ON="0"
843 if useq ppc-macos ; then 701 case ${CHOST} in
702 *-darwin*)
844 if [ ! -z "${eextra}" ]; 703 if [ ! -z "${eextra}" ];
845 then 704 then
846 einfo "Extra options are not supported on macos yet" 705 einfo "Extra options are not supported on Darwin/OS X yet"
847 einfo "Please report the ebuild along with the info below" 706 einfo "Please report the ebuild along with the info below"
848 einfo "eextra: ${eextra}" 707 einfo "eextra: ${eextra}"
849 die "Required function missing" 708 die "Required function missing"
850 fi 709 fi
851 710
852 # If we need the next available 711 # If we need the next available
853 case ${egid} in 712 case ${egid} in
854 *[!0-9]*) # Non numeric 713 *[!0-9]*) # Non numeric
855 for egid in `jot 898 101`; do 714 for egid in $(seq 101 999); do
856 [ -z "`egetent group ${egid}`" ] && break 715 [ -z "`egetent group ${egid}`" ] && break
857 done 716 done
858 esac 717 esac
859 dscl . create /groups/${egroup} gid ${egid} 718 dscl . create /groups/${egroup} gid ${egid}
860 dscl . create /groups/${egroup} passwd '*' 719 dscl . create /groups/${egroup} passwd '*'
861 elif use x86-fbsd ; then 720 ;;
721
722 *-freebsd*|*-dragonfly*)
862 case ${egid} in 723 case ${egid} in
863 *[!0-9]*) # Non numeric 724 *[!0-9]*) # Non numeric
864 for egid in `jot 898 101`; do 725 for egid in $(seq 101 999); do
865 [ -z "`egetent group ${egid}`" ] && break 726 [ -z "`egetent group ${egid}`" ] && break
866 done 727 done
867 esac 728 esac
868 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 729 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
869 else 730 ;;
731
732 *-netbsd*)
733 case ${egid} in
734 *[!0-9]*) # Non numeric
735 for egid in $(seq 101 999); do
736 [ -z "`egetent group ${egid}`" ] && break
737 done
738 esac
739 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
740 ;;
741
742 *)
870 groupadd ${opts} ${egroup} || die "enewgroup failed" 743 groupadd ${opts} ${egroup} || die "enewgroup failed"
871 fi 744 ;;
745 esac
872 export SANDBOX_ON="${oldsandbox}" 746 export SANDBOX_ON="${oldsandbox}"
873} 747}
874 748
875# Simple script to replace 'dos2unix' binaries 749# Simple script to replace 'dos2unix' binaries
876# vapier@gentoo.org 750# vapier@gentoo.org
901# name: the name that will show up in the menu 775# name: the name that will show up in the menu
902# icon: give your little like a pretty little icon ... 776# icon: give your little like a pretty little icon ...
903# this can be relative (to /usr/share/pixmaps) or 777# this can be relative (to /usr/share/pixmaps) or
904# a full path to an icon 778# a full path to an icon
905# type: what kind of application is this ? for categories: 779# type: what kind of application is this ? for categories:
906# http://www.freedesktop.org/standards/menu-spec/ 780# http://www.freedesktop.org/Standards/desktop-entry-spec
907# path: if your app needs to startup in a specific dir 781# path: if your app needs to startup in a specific dir
908make_desktop_entry() { 782make_desktop_entry() {
909 [ -z "$1" ] && eerror "make_desktop_entry: You must specify the executable" && return 1 783 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
910 784
911 local exec="${1}" 785 local exec=${1}
912 local name="${2:-${PN}}" 786 local name=${2:-${PN}}
913 local icon="${3:-${PN}.png}" 787 local icon=${3:-${PN}.png}
914 local type="${4}" 788 local type=${4}
915 local subdir="${6}" 789 local path=${5}
916 local path="${5:-${GAMES_BINDIR}}" 790
917 if [ -z "${type}" ] 791 if [[ -z ${type} ]] ; then
918 then 792 local catmaj=${CATEGORY%%-*}
919 case ${CATEGORY} in 793 local catmin=${CATEGORY##*-}
920 "app-emulation") 794 case ${catmaj} in
921 type=Emulator 795 app)
922 subdir="Emulation" 796 case ${catmin} in
797 admin) type=System;;
798 cdr) type=DiscBurning;;
799 dicts) type=Dictionary;;
800 editors) type=TextEditor;;
801 emacs) type=TextEditor;;
802 emulation) type=Emulator;;
803 laptop) type=HardwareSettings;;
804 office) type=Office;;
805 vim) type=TextEditor;;
806 xemacs) type=TextEditor;;
807 *) type=;;
808 esac
923 ;; 809 ;;
924 "games-"*) 810
925 type=Game 811 dev)
926 subdir="Games" 812 type="Development"
927 ;; 813 ;;
928 "net-"*) 814
929 type=Network 815 games)
930 subdir="${type}" 816 case ${catmin} in
817 action) type=ActionGame;;
818 arcade) type=ArcadeGame;;
819 board) type=BoardGame;;
820 kid) type=KidsGame;;
821 emulation) type=Emulator;;
822 puzzle) type=LogicGame;;
823 rpg) type=RolePlaying;;
824 roguelike) type=RolePlaying;;
825 simulation) type=Simulation;;
826 sports) type=SportsGame;;
827 strategy) type=StrategyGame;;
828 *) type=;;
829 esac
830 type="Game;${type}"
931 ;; 831 ;;
832
833 mail)
834 type="Network;Email"
835 ;;
836
837 media)
838 case ${catmin} in
839 gfx) type=Graphics;;
840 radio) type=Tuner;;
841 sound) type=Audio;;
842 tv) type=TV;;
843 video) type=Video;;
844 *) type=;;
845 esac
846 type="AudioVideo;${type}"
847 ;;
848
849 net)
850 case ${catmin} in
851 dialup) type=Dialup;;
852 ftp) type=FileTransfer;;
853 im) type=InstantMessaging;;
854 irc) type=IRCClient;;
855 mail) type=Email;;
856 news) type=News;;
857 nntp) type=News;;
858 p2p) type=FileTransfer;;
859 *) type=;;
860 esac
861 type="Network;${type}"
862 ;;
863
864 sci)
865 case ${catmin} in
866 astro*) type=Astronomy;;
867 bio*) type=Biology;;
868 calc*) type=Calculator;;
869 chem*) type=Chemistry;;
870 geo*) type=Geology;;
871 math*) type=Math;;
872 *) type=;;
873 esac
874 type="Science;${type}"
875 ;;
876
877 www)
878 case ${catmin} in
879 client) type=WebBrowser;;
880 *) type=;;
881 esac
882 type="Network"
883 ;;
884
932 *) 885 *)
933 type= 886 type=
934 subdir=
935 ;; 887 ;;
936 esac 888 esac
937 fi 889 fi
890 if [ "${SLOT}" == "0" ] ; then
891 local desktop_name="${PN}"
892 else
893 local desktop_name="${PN}-${SLOT}"
894 fi
938 local desktop="${T}/${exec}.desktop" 895 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
939 896
940echo "[Desktop Entry] 897echo "[Desktop Entry]
941Encoding=UTF-8 898Encoding=UTF-8
942Version=0.9.2 899Version=0.9.2
943Name=${name} 900Name=${name}
946Exec=${exec} 903Exec=${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 {} \;) "; 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 {} \;) ; do
1487 if [ "${op}" == "-i" ] ; then 1453 if [[ ${op} == "-i" ]] ; then
1488 [ "${ls/ ${f} /}" != "${ls}" ] && newls="${newls} ${f}" 1454 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}"
1489 else 1455 else
1490 [ "${ls/ ${f} /}" == "${ls}" ] && newls="${newls} ${f}" 1456 [[ ${ls/ ${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}" 1461 ls=${ls//.po}
1496 else 1462 else
1497 ls="$@" 1463 ls=$@
1498 fi 1464 fi
1499 1465
1500 ls=" ${ls} " 1466 ls=" ${ls} "
1501 newls="" 1467 newls=""
1502 for f in ${LINGUAS} ; do 1468 for f in ${LINGUAS} ; do
1503 if [ "${ls/ ${f} /}" != "${ls}" ] ; then 1469 if [[ ${ls/ ${f} /} != ${ls} ]] ; then
1504 newls="${newls} ${f}" 1470 newls="${newls} ${f}"
1505 else 1471 else
1506 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1472 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA"
1507 fi 1473 fi
1508 done 1474 done
1509 if [ -z "${newls}" ] ; then 1475 if [[ -z ${newls} ]] ; then
1510 unset LINGUAS 1476 export LINGUAS=""
1511 else 1477 else
1512 export LINGUAS="${newls}" 1478 export LINGUAS=${newls:1}
1513 fi 1479 fi
1514} 1480}
1515 1481
1516# moved from kernel.eclass since they are generally useful outside of 1482# moved from kernel.eclass since they are generally useful outside of
1517# kernel.eclass -iggy (20041002) 1483# kernel.eclass -iggy (20041002)
1525 while ((i--)) ; do 1491 while ((i--)) ; do
1526 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass" 1492 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1527 done 1493 done
1528 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1494 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1529 case ${ARCH} in 1495 case ${ARCH} in
1530 x86) export ARCH="i386";; 1496 x86) export ARCH="i386";;
1531 amd64) export ARCH="x86_64";; 1497 amd64) export ARCH="x86_64";;
1532 hppa) export ARCH="parisc";; 1498 hppa) export ARCH="parisc";;
1533 mips) export ARCH="mips";; 1499 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! 1500 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}";; 1501 *) export ARCH="${ARCH}";;
1536 esac 1502 esac
1537} 1503}
1538 1504
1539# set's ARCH back to what portage expects 1505# set's ARCH back to what portage expects
1540set_arch_to_portage() { 1506set_arch_to_portage() {
1547 1513
1548# Jeremy Huddleston <eradicator@gentoo.org>: 1514# Jeremy Huddleston <eradicator@gentoo.org>:
1549# preserve_old_lib /path/to/libblah.so.0 1515# preserve_old_lib /path/to/libblah.so.0
1550# preserve_old_lib_notify /path/to/libblah.so.0 1516# preserve_old_lib_notify /path/to/libblah.so.0
1551# 1517#
1552# These functions are useful when a lib in your package changes --soname. Such 1518# 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 1519# 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 1520# 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 1521# 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: 1522# solution, so instead you can add the following to your ebuilds:
1557# 1523#
1584 LIB=$1 1550 LIB=$1
1585 1551
1586 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1552 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1587 SONAME=`basename ${LIB}` 1553 SONAME=`basename ${LIB}`
1588 1554
1589 einfo "An old version of an installed library was detected on your system." 1555 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" 1556 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," 1557 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:" 1558 ewarn "you will need to execute the following command:"
1593 einfo " revdep-rebuild --soname ${SONAME}" 1559 ewarn " revdep-rebuild --library ${SONAME}"
1594 einfo 1560 ewarn
1595 einfo "After doing that, you can safely remove ${LIB}" 1561 ewarn "After doing that, you can safely remove ${LIB}"
1596 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1562 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1597 fi 1563 fi
1598} 1564}
1599 1565
1600# Hack for people to figure out if a package was built with 1566# Hack for people to figure out if a package was built with
1601# certain USE flags 1567# certain USE flags
1611 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1577 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1612 1578
1613 local PKG=$(best_version $1) 1579 local PKG=$(best_version $1)
1614 shift 1580 shift
1615 1581
1616 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE" 1582 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
1583
1584 # if the USE file doesnt exist, assume the $PKG is either
1585 # injected or package.provided
1617 [[ ! -e ${USEFILE} ]] && return 1 1586 [[ ! -e ${USEFILE} ]] && return 0
1618 1587
1619 local USE_BUILT=$(<${USEFILE}) 1588 local USE_BUILT=$(<${USEFILE})
1620 while [[ $# -gt 0 ]] ; do 1589 while [[ $# -gt 0 ]] ; do
1621 if [[ ${opt} = "-o" ]] ; then 1590 if [[ ${opt} = "-o" ]] ; then
1622 has $1 ${USE_BUILT} && return 0 1591 has $1 ${USE_BUILT} && return 0
1639 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null 1608 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
1640 done 1609 done
1641 eend 0 1610 eend 0
1642} 1611}
1643 1612
1644# dopamd [ file ] [ new file ] 1613# dopamd <file> [more files]
1645# 1614#
1646# Install pam auth config file in /etc/pam.d 1615# 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() { 1616dopamd() {
1652 local pamd="$1" newpamd="${2:-$1}"
1653 [[ -z "$1" ]] && die "dopamd requires at least one argument." 1617 [[ -z $1 ]] && die "dopamd requires at least one argument"
1654 1618
1655 use pam || return 0 1619 use pam || return 0
1656 1620
1657 insinto /etc/pam.d 1621 INSDESTTREE=/etc/pam.d \
1658 # these are the default doins options, but be explicit just in case 1622 doins "$@" || die "failed to install $@"
1659 insopts -m 0644 -o root -g root
1660 newins ${pamd} ${newpamd} || die "failed to install ${newpamd}"
1661} 1623}
1624# newpamd <old name> <new name>
1625#
1626# Install pam file <old name> as <new name> in /etc/pam.d
1627newpamd() {
1628 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1629
1630 use pam || return 0
1631
1632 INSDESTTREE=/etc/pam.d \
1633 newins "$1" "$2" || die "failed to install $1 as $2"
1634}
1635
1636# make a wrapper script ...
1637# NOTE: this was originally games_make_wrapper, but I noticed other places where
1638# this could be used, so I have moved it here and made it not games-specific
1639# -- wolf31o2
1640# $1 == wrapper name
1641# $2 == binary to run
1642# $3 == directory to chdir before running binary
1643# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1644# $5 == path for wrapper
1645make_wrapper() {
1646 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1647 local tmpwrapper=$(emktemp)
1648 # We don't want to quote ${bin} so that people can pass complex
1649 # things as $bin ... "./someprog --args"
1650 cat << EOF > "${tmpwrapper}"
1651#!/bin/sh
1652cd "${chdir:-.}"
1653if [ -n "${libdir}" ] ; then
1654 if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
1655 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1656 else
1657 export LD_LIBRARY_PATH="${libdir}"
1658 fi
1659fi
1660exec ${bin} "\$@"
1661EOF
1662 chmod go+rx "${tmpwrapper}"
1663 if [[ -n ${path} ]] ; then
1664 exeinto "${path}"
1665 newexe "${tmpwrapper}" "${wrapper}"
1666 else
1667 newbin "${tmpwrapper}" "${wrapper}"
1668 fi
1669}

Legend:
Removed from v.1.144  
changed lines
  Added in v.1.233

  ViewVC Help
Powered by ViewVC 1.1.20