/[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.200
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.200 2005/09/23 20:44:26 wolf31o2 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 )"
15# sys-apps/shadow is needed for useradd, etc, bug #94745.
17 16
18DESCRIPTION="Based on the ${ECLASS} eclass" 17DESCRIPTION="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 18
57# Wait for the supplied number of seconds. If no argument is supplied, defaults 19# 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 20# 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 21# outputting to a terminal, don't wait. For compatability purposes, the argument
60# must be an integer greater than zero. 22# must be an integer greater than zero.
102gen_usr_ldscript() { 64gen_usr_ldscript() {
103 local libdir="$(get_libdir)" 65 local libdir="$(get_libdir)"
104 # Just make sure it exists 66 # Just make sure it exists
105 dodir /usr/${libdir} 67 dodir /usr/${libdir}
106 68
69 for lib in "${@}" ; do
107 cat > "${D}/usr/${libdir}/${1}" << END_LDSCRIPT 70 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT
108/* GNU ld script 71 /* GNU ld script
109 Because Gentoo have critical dynamic libraries 72 Since Gentoo has critical dynamic libraries
110 in /lib, and the static versions in /usr/lib, we 73 in /lib, and the static versions in /usr/lib,
111 need to have a "fake" dynamic lib in /usr/lib, 74 we need to have a "fake" dynamic lib in /usr/lib,
112 otherwise we run into linking problems. 75 otherwise we run into linking problems.
113 See bug #4411 on http://bugs.gentoo.org/ for 76
114 more info. */ 77 See bug http://bugs.gentoo.org/4411 for more info.
78 */
115GROUP ( /${libdir}/${1} ) 79 GROUP ( /${libdir}/${lib} )
116END_LDSCRIPT 80 END_LDSCRIPT
117 fperms a+x "/usr/${libdir}/${1}" 81 fperms a+x "/usr/${libdir}/${lib}"
82 done
118} 83}
119 84
120# Simple function to draw a line consisting of '=' the same length as $* 85# Simple function to draw a line consisting of '=' the same length as $*
86# - only to be used by epatch()
121# 87#
122# <azarah@gentoo.org> (11 Nov 2002) 88# <azarah@gentoo.org> (11 Nov 2002)
123# 89#
124draw_line() { 90draw_line() {
125 local i=0 91 local i=0
151EPATCH_SOURCE="${WORKDIR}/patch" 117EPATCH_SOURCE="${WORKDIR}/patch"
152# Default extension for patches 118# Default extension for patches
153EPATCH_SUFFIX="patch.bz2" 119EPATCH_SUFFIX="patch.bz2"
154# Default options for patch 120# Default options for patch
155# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571 121# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571
156EPATCH_OPTS="-g0" 122# Set --no-backup-if-mismatch so we don't leave '.orig' files behind.
123EPATCH_OPTS="-g0 --no-backup-if-mismatch"
157# List of patches not to apply. Not this is only file names, 124# List of patches not to apply. Not this is only file names,
158# and not the full path .. 125# and not the full path ..
159EPATCH_EXCLUDE="" 126EPATCH_EXCLUDE=""
160# Change the printed message for a single patch. 127# Change the printed message for a single patch.
161EPATCH_SINGLE_MSG="" 128EPATCH_SINGLE_MSG=""
129# Change the printed message for multiple patches.
130EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..."
162# Force applying bulk patches even if not following the style: 131# Force applying bulk patches even if not following the style:
163# 132#
164# ??_${ARCH}_foo.${EPATCH_SUFFIX} 133# ??_${ARCH}_foo.${EPATCH_SUFFIX}
165# 134#
166EPATCH_FORCE="no" 135EPATCH_FORCE="no"
204 local PATCH_TARGET="${T}/$$.patch" 173 local PATCH_TARGET="${T}/$$.patch"
205 local PATCH_SUFFIX="" 174 local PATCH_SUFFIX=""
206 local SINGLE_PATCH="no" 175 local SINGLE_PATCH="no"
207 local x="" 176 local x=""
208 177
178 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
179
209 if [ "$#" -gt 1 ] 180 if [ "$#" -gt 1 ]
210 then 181 then
211 local m="" 182 local m=""
212 einfo "${#} patches to apply ..."
213 for m in "$@" ; do 183 for m in "$@" ; do
214 epatch "${m}" 184 epatch "${m}"
215 done 185 done
216 return 0 186 return 0
217 fi 187 fi
271 ;; 241 ;;
272 esac 242 esac
273 243
274 if [ "${SINGLE_PATCH}" = "no" ] 244 if [ "${SINGLE_PATCH}" = "no" ]
275 then 245 then
276 einfo "Applying various patches (bugfixes/updates) ..." 246 einfo "${EPATCH_MULTI_MSG}"
277 fi 247 fi
278 for x in ${EPATCH_SOURCE} 248 for x in ${EPATCH_SOURCE}
279 do 249 do
280 # New ARCH dependant patch naming scheme ... 250 # New ARCH dependant patch naming scheme ...
281 # 251 #
282 # ???_arch_foo.patch 252 # ???_arch_foo.patch
283 # 253 #
284 if [ -f ${x} ] && \ 254 if [ -f ${x} ] && \
285 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "`eval echo \$\{x/_${ARCH}_\}`" != "${x}" ] || \ 255 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "${x/_${ARCH}_}" != "${x}" ] || \
286 [ "${EPATCH_FORCE}" = "yes" ]) 256 [ "${EPATCH_FORCE}" = "yes" ])
287 then 257 then
288 local count=0 258 local count=0
289 local popts="${EPATCH_OPTS}" 259 local popts="${EPATCH_OPTS}"
260 local patchname=${x##*/}
290 261
291 if [ -n "${EPATCH_EXCLUDE}" ] 262 if [ -n "${EPATCH_EXCLUDE}" ]
292 then 263 then
293 if [ "`eval echo \$\{EPATCH_EXCLUDE/${x##*/}\}`" != "${EPATCH_EXCLUDE}" ] 264 if [ "${EPATCH_EXCLUDE/${patchname}}" != "${EPATCH_EXCLUDE}" ]
294 then 265 then
295 continue 266 continue
296 fi 267 fi
297 fi 268 fi
298 269
300 then 271 then
301 if [ -n "${EPATCH_SINGLE_MSG}" ] 272 if [ -n "${EPATCH_SINGLE_MSG}" ]
302 then 273 then
303 einfo "${EPATCH_SINGLE_MSG}" 274 einfo "${EPATCH_SINGLE_MSG}"
304 else 275 else
305 einfo "Applying ${x##*/} ..." 276 einfo "Applying ${patchname} ..."
306 fi 277 fi
307 else 278 else
308 einfo " ${x##*/} ..." 279 einfo " ${patchname} ..."
309 fi 280 fi
310 281
311 echo "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 282 echo "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
312 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 283 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
313 284
314 # Allow for prefix to differ ... im lazy, so shoot me :/ 285 # Allow for prefix to differ ... im lazy, so shoot me :/
315 while [ "${count}" -lt 5 ] 286 while [ "${count}" -lt 5 ]
316 do 287 do
317 # Generate some useful debug info ... 288 # Generate some useful debug info ...
318 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 289 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
319 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 290 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
320 291
321 if [ "${PATCH_SUFFIX}" != "patch" ] 292 if [ "${PATCH_SUFFIX}" != "patch" ]
322 then 293 then
323 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 294 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
324 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 295 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
325 else 296 else
326 PATCH_TARGET="${x}" 297 PATCH_TARGET="${x}"
327 fi 298 fi
328 299
329 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 300 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
330 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 301 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
331 302
332 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 303 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
333 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 304 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
334 305
335 if [ "${PATCH_SUFFIX}" != "patch" ] 306 if [ "${PATCH_SUFFIX}" != "patch" ]
336 then 307 then
337 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1 308 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
338 then 309 then
339 echo 310 echo
340 eerror "Could not extract patch!" 311 eerror "Could not extract patch!"
341 #die "Could not extract patch!" 312 #die "Could not extract patch!"
342 count=5 313 count=5
343 break 314 break
344 fi 315 fi
345 fi 316 fi
346 317
347 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1 318 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
348 then 319 then
349 draw_line "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 320 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
350 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 321 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
351 echo "ACTUALLY APPLYING ${x##*/} ..." >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 322 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
352 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 323 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
353 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 324 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
354 325
355 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 2>&1 326 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
356 327
357 if [ "$?" -ne 0 ] 328 if [ "$?" -ne 0 ]
358 then 329 then
359 cat ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 330 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
360 echo 331 echo
361 eerror "A dry-run of patch command succeeded, but actually" 332 eerror "A dry-run of patch command succeeded, but actually"
362 eerror "applying the patch failed!" 333 eerror "applying the patch failed!"
363 #die "Real world sux compared to the dreamworld!" 334 #die "Real world sux compared to the dreamworld!"
364 count=5 335 count=5
365 fi 336 fi
366 337
367 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 338 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
368 339
369 break 340 break
370 fi 341 fi
371 342
372 count=$((count + 1)) 343 count=$((count + 1))
378 fi 349 fi
379 350
380 if [ "${count}" -eq 5 ] 351 if [ "${count}" -eq 5 ]
381 then 352 then
382 echo 353 echo
383 eerror "Failed Patch: ${x##*/}!" 354 eerror "Failed Patch: ${patchname} !"
355 eerror " ( ${PATCH_TARGET} )"
384 eerror 356 eerror
385 eerror "Include in your bugreport the contents of:" 357 eerror "Include in your bugreport the contents of:"
386 eerror 358 eerror
387 eerror " ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}" 359 eerror " ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}"
388 echo 360 echo
389 die "Failed Patch: ${x##*/}!" 361 die "Failed Patch: ${patchname}!"
390 fi 362 fi
391 363
392 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 364 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
393 365
394 eend 0 366 eend 0
395 fi 367 fi
396 done 368 done
397 if [ "${SINGLE_PATCH}" = "no" ] 369 if [ "${SINGLE_PATCH}" = "no" ]
398 then 370 then
399 einfo "Done with patching" 371 einfo "Done with patching"
400 fi 372 fi
401} 373}
402 374
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) 375# Cheap replacement for when debianutils (and thus mktemp)
530# does not exist on the users system 376# does not exist on the users system
531# vapier@gentoo.org 377# vapier@gentoo.org
532# 378#
533# Takes just 1 optional parameter (the directory to create tmpfile in) 379# Takes just 1 optional parameter (the directory to create tmpfile in)
534emktemp() { 380emktemp() {
535 local exe="touch" 381 local exe="touch"
536 [ "$1" == "-d" ] && exe="mkdir" && shift 382 [[ $1 == -d ]] && exe="mkdir" && shift
537 local topdir="$1" 383 local topdir=$1
538 384
539 if [ -z "${topdir}" ] 385 if [[ -z ${topdir} ]] ; then
540 then
541 [ -z "${T}" ] \ 386 [[ -z ${T} ]] \
542 && topdir="/tmp" \ 387 && topdir="/tmp" \
543 || topdir="${T}" 388 || topdir=${T}
544 fi 389 fi
545 390
546 if [ -z "$(type -p mktemp)" ] 391 if [[ -z $(type -p mktemp) ]] ; then
547 then
548 local tmp=/ 392 local tmp=/
549 while [ -e "${tmp}" ] ; do 393 while [[ -e ${tmp} ]] ; do
550 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 394 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
551 done 395 done
552 ${exe} "${tmp}" 396 ${exe} "${tmp}" || ${exe} -p "${tmp}"
553 echo "${tmp}" 397 echo "${tmp}"
554 else 398 else
555 [ "${exe}" == "touch" ] \ 399 [[ ${exe} == "touch" ]] \
556 && exe="-p" \ 400 && exe="-p" \
557 || exe="-d" 401 || exe="-d"
558 mktemp ${exe} "${topdir}" 402 mktemp ${exe} "${topdir}"
559 fi 403 fi
560} 404}
564# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 408# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
565# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 409# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
566# 410#
567# egetent(database, key) 411# egetent(database, key)
568egetent() { 412egetent() {
569 if useq ppc-macos ; then 413 if [[ "${USERLAND}" == "Darwin" ]] ; then
570 case "$2" in 414 case "$2" in
571 *[!0-9]*) # Non numeric 415 *[!0-9]*) # Non numeric
572 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 416 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
573 ;; 417 ;;
574 *) # Numeric 418 *) # Numeric
575 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 419 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
576 ;; 420 ;;
577 esac 421 esac
578 elif useq x86-fbsd ; then 422 elif [[ "${USERLAND}" == "BSD" ]] ; then
579 local action 423 local action
580 if [ "$1" == "passwd" ] 424 if [ "$1" == "passwd" ]
581 then 425 then
582 action="user" 426 action="user"
583 else 427 else
603# homedir: /dev/null 447# homedir: /dev/null
604# groups: none 448# groups: none
605# extra: comment of 'added by portage for ${PN}' 449# extra: comment of 'added by portage for ${PN}'
606enewuser() { 450enewuser() {
607 # get the username 451 # get the username
608 local euser="$1"; shift 452 local euser=$1; shift
609 if [ -z "${euser}" ] 453 if [[ -z ${euser} ]] ; then
610 then
611 eerror "No username specified !" 454 eerror "No username specified !"
612 die "Cannot call enewuser without a username" 455 die "Cannot call enewuser without a username"
613 fi 456 fi
614 457
615 # lets see if the username already exists 458 # lets see if the username already exists
616 if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ] 459 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then
617 then
618 return 0 460 return 0
619 fi 461 fi
620 einfo "Adding user '${euser}' to your system ..." 462 einfo "Adding user '${euser}' to your system ..."
621 463
622 # options to pass to useradd 464 # options to pass to useradd
623 local opts= 465 local opts=
624 466
625 # handle uid 467 # handle uid
626 local euid="$1"; shift 468 local euid=$1; shift
627 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] 469 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then
628 then
629 if [ "${euid}" -gt 0 ] 470 if [[ ${euid} -gt 0 ]] ; then
630 then
631 if [ ! -z "`egetent passwd ${euid}`" ] 471 if [[ ! -z $(egetent passwd ${euid}) ]] ; then
632 then
633 euid="next" 472 euid="next"
634 fi 473 fi
635 else 474 else
636 eerror "Userid given but is not greater than 0 !" 475 eerror "Userid given but is not greater than 0 !"
637 die "${euid} is not a valid UID" 476 die "${euid} is not a valid UID"
638 fi 477 fi
639 else 478 else
640 euid="next" 479 euid="next"
641 fi 480 fi
642 if [ "${euid}" == "next" ] 481 if [[ ${euid} == "next" ]] ; then
643 then 482 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 483 [[ -z $(egetent passwd ${euid}) ]] && break
652 done 484 done
653 fi 485 fi
654 opts="${opts} -u ${euid}" 486 opts="${opts} -u ${euid}"
655 einfo " - Userid: ${euid}" 487 einfo " - Userid: ${euid}"
656 488
657 # handle shell 489 # handle shell
658 local eshell="$1"; shift 490 local eshell=$1; shift
659 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ] 491 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
660 then
661 if [ ! -e "${eshell}" ] 492 if [[ ! -e ${eshell} ]] ; then
662 then
663 eerror "A shell was specified but it does not exist !" 493 eerror "A shell was specified but it does not exist !"
664 die "${eshell} does not exist" 494 die "${eshell} does not exist"
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 ${USERLAND} 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 BSD)
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
760 else 585 ;;
761 if [ -z "${eextra}" ] 586 *)
762 then 587 if [[ -z $@ ]] ; then
763 useradd ${opts} ${euser} \ 588 useradd ${opts} ${euser} \
764 -c "added by portage for ${PN}" \ 589 -c "added by portage for ${PN}" \
765 || die "enewuser failed" 590 || die "enewuser failed"
766 else 591 else
767 einfo " - Extra: ${eextra}" 592 einfo " - Extra: $@"
768 useradd ${opts} ${euser} ${eextra} \ 593 useradd ${opts} ${euser} "$@" \
769 || die "enewuser failed" 594 || die "enewuser failed"
770 fi 595 fi
596 ;;
597 esac
598
599 if [[ ! -e ${ROOT}/${ehome} ]] ; then
600 einfo " - Creating ${ehome} in ${ROOT}"
601 mkdir -p "${ROOT}/${ehome}"
602 chown ${euser} "${ROOT}/${ehome}"
603 chmod 755 "${ROOT}/${ehome}"
771 fi 604 fi
605
772 export SANDBOX_ON="${oldsandbox}" 606 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} 607}
782 608
783# Simplify/standardize adding groups to the system 609# Simplify/standardize adding groups to the system
784# vapier@gentoo.org 610# vapier@gentoo.org
785# 611#
814 then 640 then
815 if [ "${egid}" -gt 0 ] 641 if [ "${egid}" -gt 0 ]
816 then 642 then
817 if [ -z "`egetent group ${egid}`" ] 643 if [ -z "`egetent group ${egid}`" ]
818 then 644 then
819 if useq ppc-macos ; then 645 if [[ "${USERLAND}" == "Darwin" ]]; then
820 opts="${opts} ${egid}" 646 opts="${opts} ${egid}"
821 else 647 else
822 opts="${opts} -g ${egid}" 648 opts="${opts} -g ${egid}"
823 fi 649 fi
824 else 650 else
838 opts="${opts} ${eextra}" 664 opts="${opts} ${eextra}"
839 665
840 # add the group 666 # add the group
841 local oldsandbox="${SANDBOX_ON}" 667 local oldsandbox="${SANDBOX_ON}"
842 export SANDBOX_ON="0" 668 export SANDBOX_ON="0"
843 if useq ppc-macos ; then 669 if [[ "${USERLAND}" == "Darwin" ]]; then
844 if [ ! -z "${eextra}" ]; 670 if [ ! -z "${eextra}" ];
845 then 671 then
846 einfo "Extra options are not supported on macos yet" 672 einfo "Extra options are not supported on Darwin/OS X yet"
847 einfo "Please report the ebuild along with the info below" 673 einfo "Please report the ebuild along with the info below"
848 einfo "eextra: ${eextra}" 674 einfo "eextra: ${eextra}"
849 die "Required function missing" 675 die "Required function missing"
850 fi 676 fi
851 677
852 # If we need the next available 678 # If we need the next available
853 case ${egid} in 679 case ${egid} in
854 *[!0-9]*) # Non numeric 680 *[!0-9]*) # Non numeric
855 for egid in `jot 898 101`; do 681 for egid in $(seq 101 999); do
856 [ -z "`egetent group ${egid}`" ] && break 682 [ -z "`egetent group ${egid}`" ] && break
857 done 683 done
858 esac 684 esac
859 dscl . create /groups/${egroup} gid ${egid} 685 dscl . create /groups/${egroup} gid ${egid}
860 dscl . create /groups/${egroup} passwd '*' 686 dscl . create /groups/${egroup} passwd '*'
861 elif use x86-fbsd ; then 687 elif [[ "${USERLAND}" == "BSD" ]] ; then
862 case ${egid} in 688 case ${egid} in
863 *[!0-9]*) # Non numeric 689 *[!0-9]*) # Non numeric
864 for egid in `jot 898 101`; do 690 for egid in $(seq 101 999); do
865 [ -z "`egetent group ${egid}`" ] && break 691 [ -z "`egetent group ${egid}`" ] && break
866 done 692 done
867 esac 693 esac
868 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 694 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
869 else 695 else
901# name: the name that will show up in the menu 727# name: the name that will show up in the menu
902# icon: give your little like a pretty little icon ... 728# icon: give your little like a pretty little icon ...
903# this can be relative (to /usr/share/pixmaps) or 729# this can be relative (to /usr/share/pixmaps) or
904# a full path to an icon 730# a full path to an icon
905# type: what kind of application is this ? for categories: 731# type: what kind of application is this ? for categories:
906# http://www.freedesktop.org/standards/menu-spec/ 732# http://www.freedesktop.org/Standards/desktop-entry-spec
907# path: if your app needs to startup in a specific dir 733# path: if your app needs to startup in a specific dir
908make_desktop_entry() { 734make_desktop_entry() {
909 [ -z "$1" ] && eerror "make_desktop_entry: You must specify the executable" && return 1 735 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
910 736
911 local exec="${1}" 737 local exec=${1}
912 local name="${2:-${PN}}" 738 local name=${2:-${PN}}
913 local icon="${3:-${PN}.png}" 739 local icon=${3:-${PN}.png}
914 local type="${4}" 740 local type=${4}
915 local subdir="${6}" 741 local path=${5}
916 local path="${5:-${GAMES_BINDIR}}" 742
917 if [ -z "${type}" ] 743 if [[ -z ${type} ]] ; then
918 then 744 local catmaj=${CATEGORY%%-*}
919 case ${CATEGORY} in 745 local catmin=${CATEGORY##*-}
920 "app-emulation") 746 case ${catmaj} in
921 type=Emulator 747 app)
922 subdir="Emulation" 748 case ${catmin} in
749 admin) type=System;;
750 cdr) type=DiscBurning;;
751 dicts) type=Dictionary;;
752 editors) type=TextEditor;;
753 emacs) type=TextEditor;;
754 emulation) type=Emulator;;
755 laptop) type=HardwareSettings;;
756 office) type=Office;;
757 vim) type=TextEditor;;
758 xemacs) type=TextEditor;;
759 *) type=;;
760 esac
923 ;; 761 ;;
924 "games-"*) 762
925 type=Game 763 dev)
926 subdir="Games" 764 type="Development"
927 ;; 765 ;;
928 "net-"*) 766
929 type=Network 767 games)
930 subdir="${type}" 768 case ${catmin} in
769 action) type=ActionGame;;
770 arcade) type=ArcadeGame;;
771 board) type=BoardGame;;
772 kid) type=KidsGame;;
773 emulation) type=Emulator;;
774 puzzle) type=LogicGame;;
775 rpg) type=RolePlaying;;
776 roguelike) type=RolePlaying;;
777 simulation) type=Simulation;;
778 sports) type=SportsGame;;
779 strategy) type=StrategyGame;;
780 *) type=;;
781 esac
782 type="Game;${type}"
931 ;; 783 ;;
784
785 mail)
786 type="Network;Email"
787 ;;
788
789 media)
790 case ${catmin} in
791 gfx) type=Graphics;;
792 radio) type=Tuner;;
793 sound) type=Audio;;
794 tv) type=TV;;
795 video) type=Video;;
796 *) type=;;
797 esac
798 type="AudioVideo;${type}"
799 ;;
800
801 net)
802 case ${catmin} in
803 dialup) type=Dialup;;
804 ftp) type=FileTransfer;;
805 im) type=InstantMessaging;;
806 irc) type=IRCClient;;
807 mail) type=Email;;
808 news) type=News;;
809 nntp) type=News;;
810 p2p) type=FileTransfer;;
811 *) type=;;
812 esac
813 type="Network;${type}"
814 ;;
815
816 sci)
817 case ${catmin} in
818 astro*) type=Astronomoy;;
819 bio*) type=Biology;;
820 calc*) type=Calculator;;
821 chem*) type=Chemistry;;
822 geo*) type=Geology;;
823 math*) type=Math;;
824 *) type=;;
825 esac
826 type="Science;${type}"
827 ;;
828
829 www)
830 case ${catmin} in
831 client) type=WebBrowser;;
832 *) type=;;
833 esac
834 type="Network"
835 ;;
836
932 *) 837 *)
933 type= 838 type=
934 subdir=
935 ;; 839 ;;
936 esac 840 esac
937 fi 841 fi
842 if [ "${SLOT}" == "0" ] ; then
843 local desktop_name="${PN}"
844 else
845 local desktop_name="${PN}-${SLOT}"
846 fi
938 local desktop="${T}/${exec}.desktop" 847 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
939 848
940echo "[Desktop Entry] 849echo "[Desktop Entry]
941Encoding=UTF-8 850Encoding=UTF-8
942Version=0.9.2 851Version=0.9.2
943Name=${name} 852Name=${name}
959# make_desktop_entry(<title>, <command>) 868# make_desktop_entry(<title>, <command>)
960# title: File to execute to start the Window Manager 869# title: File to execute to start the Window Manager
961# command: Name of the Window Manager 870# command: Name of the Window Manager
962 871
963make_session_desktop() { 872make_session_desktop() {
964
965 [ -z "$1" ] && eerror "make_session_desktop: You must specify the title" && return 1 873 [[ -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 874 [[ -z $2 ]] && eerror "make_session_desktop: You must specify the command" && return 1
967 875
968 local title="${1}" 876 local title=$1
969 local command="${2}" 877 local command=$2
970 local desktop="${T}/${wm}.desktop" 878 local desktop=${T}/${wm}.desktop
971 879
972echo "[Desktop Entry] 880echo "[Desktop Entry]
973Encoding=UTF-8 881Encoding=UTF-8
974Name=${title} 882Name=${title}
975Comment=This session logs you into ${title} 883Comment=This session logs you into ${title}
977TryExec=${command} 885TryExec=${command}
978Type=Application" > "${desktop}" 886Type=Application" > "${desktop}"
979 887
980 insinto /usr/share/xsessions 888 insinto /usr/share/xsessions
981 doins "${desktop}" 889 doins "${desktop}"
982
983 return 0
984} 890}
985 891
986domenu() { 892domenu() {
987 local i 893 local i j
988 local j
989 insinto /usr/share/applications 894 insinto /usr/share/applications
990 for i in ${@} 895 for i in "$@" ; do
991 do
992 if [ -f "${i}" ]; 896 if [[ -f ${i} ]] ; then
993 then
994 doins ${i} 897 doins "${i}"
995 elif [ -d "${i}" ]; 898 elif [[ -d ${i} ]] ; then
996 then
997 for j in ${i}/*.desktop 899 for j in "${i}"/*.desktop ; do
998 do
999 doins ${j} 900 doins "${j}"
1000 done 901 done
1001 fi 902 fi
1002 done 903 done
1003} 904}
905newmenu() {
906 insinto /usr/share/applications
907 newins "$1" "$2"
908}
1004 909
1005doicon() { 910doicon() {
1006 local i 911 local i j
1007 local j
1008 insinto /usr/share/pixmaps 912 insinto /usr/share/pixmaps
1009 for i in ${@} 913 for i in "$@" ; do
1010 do
1011 if [ -f "${i}" ]; 914 if [[ -f ${i} ]] ; then
1012 then
1013 doins ${i} 915 doins "${i}"
1014 elif [ -d "${i}" ]; 916 elif [[ -d ${i} ]] ; then
1015 then
1016 for j in ${i}/*.png 917 for j in "${i}"/*.png ; do
1017 do
1018 doins ${j} 918 doins "${j}"
1019 done 919 done
1020 fi 920 fi
1021 done 921 done
922}
923newicon() {
924 insinto /usr/share/pixmaps
925 newins "$1" "$2"
1022} 926}
1023 927
1024############################################################## 928##############################################################
1025# END: Handle .desktop files and menu entries # 929# END: Handle .desktop files and menu entries #
1026############################################################## 930##############################################################
1027 931
1028 932
1029# for internal use only (unpack_pdv and unpack_makeself) 933# for internal use only (unpack_pdv and unpack_makeself)
1030find_unpackable_file() { 934find_unpackable_file() {
1031 local src="$1" 935 local src=$1
1032 if [ -z "${src}" ] 936 if [[ -z ${src} ]] ; then
1033 then
1034 src="${DISTDIR}/${A}" 937 src=${DISTDIR}/${A}
1035 else 938 else
1036 if [ -e "${DISTDIR}/${src}" ] 939 if [[ -e ${DISTDIR}/${src} ]] ; then
1037 then
1038 src="${DISTDIR}/${src}" 940 src=${DISTDIR}/${src}
1039 elif [ -e "${PWD}/${src}" ] 941 elif [[ -e ${PWD}/${src} ]] ; then
1040 then
1041 src="${PWD}/${src}" 942 src=${PWD}/${src}
1042 elif [ -e "${src}" ] 943 elif [[ -e ${src} ]] ; then
1043 then
1044 src="${src}" 944 src=${src}
1045 fi
1046 fi 945 fi
1047 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 946 fi
947 [[ ! -e ${src} ]] && return 1
1048 echo "${src}" 948 echo "${src}"
1049} 949}
1050 950
1051# Unpack those pesky pdv generated files ... 951# Unpack those pesky pdv generated files ...
1052# They're self-unpacking programs with the binary package stuffed in 952# They're self-unpacking programs with the binary package stuffed in
1067# lseek 967# lseek
1068# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 968# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
1069# lseek(3, -4, SEEK_END) = 2981250 969# lseek(3, -4, SEEK_END) = 2981250
1070# thus we would pass in the value of '4' as the second parameter. 970# thus we would pass in the value of '4' as the second parameter.
1071unpack_pdv() { 971unpack_pdv() {
1072 local src="`find_unpackable_file $1`" 972 local src=$(find_unpackable_file $1)
1073 local sizeoff_t="$2" 973 local sizeoff_t=$2
1074 974
975 [[ -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 :(" 976 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
1076 977
1077 local shrtsrc="`basename ${src}`" 978 local shrtsrc="`basename ${src}`"
1078 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 979 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1079 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 980 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\"` 981 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
1146# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1047# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1147# - If the file is not specified then unpack will utilize ${A}. 1048# - If the file is not specified then unpack will utilize ${A}.
1148# - If the offset is not specified then we will attempt to extract 1049# - If the offset is not specified then we will attempt to extract
1149# the proper offset from the script itself. 1050# the proper offset from the script itself.
1150unpack_makeself() { 1051unpack_makeself() {
1151 local src="$(find_unpackable_file "$1")" 1052 local src=$(find_unpackable_file "$1")
1152 local skip="$2" 1053 local skip=$2
1153 local exe="$3" 1054 local exe=$3
1154 1055
1056 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1057
1155 local shrtsrc="$(basename "${src}")" 1058 local shrtsrc=$(basename "${src}")
1156 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1059 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1157 if [ -z "${skip}" ] 1060 if [ -z "${skip}" ]
1158 then 1061 then
1159 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1062 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`"
1160 local skip=0 1063 local skip=0
1231check_license() { 1134check_license() {
1232 local lic=$1 1135 local lic=$1
1233 if [ -z "${lic}" ] ; then 1136 if [ -z "${lic}" ] ; then
1234 lic="${PORTDIR}/licenses/${LICENSE}" 1137 lic="${PORTDIR}/licenses/${LICENSE}"
1235 else 1138 else
1236 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1139 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1237 lic="${PORTDIR}/licenses/${src}" 1140 lic="${PORTDIR}/licenses/${lic}"
1238 elif [ -e "${PWD}/${src}" ] ; then 1141 elif [ -e "${PWD}/${lic}" ] ; then
1239 lic="${PWD}/${src}" 1142 lic="${PWD}/${lic}"
1240 elif [ -e "${src}" ] ; then 1143 elif [ -e "${lic}" ] ; then
1241 lic="${src}" 1144 lic="${lic}"
1242 fi
1243 fi 1145 fi
1146 fi
1244 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1147 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1245 local l="`basename ${lic}`" 1148 local l="`basename ${lic}`"
1246 1149
1247 # here is where we check for the licenses the user already 1150 # 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 1151 # accepted ... if we don't find a match, we make the user accept
1249 local shopts=$- 1152 local shopts=$-
1420# displayed and we'll hang out here until: 1323# displayed and we'll hang out here until:
1421# (1) the file is found on a mounted cdrom 1324# (1) the file is found on a mounted cdrom
1422# (2) the user hits CTRL+C 1325# (2) the user hits CTRL+C
1423cdrom_locate_file_on_cd() { 1326cdrom_locate_file_on_cd() {
1424 while [[ -z ${CDROM_ROOT} ]] ; do 1327 while [[ -z ${CDROM_ROOT} ]] ; do
1425 local dir="$(dirname ${@})" 1328 local dir=$(dirname "$*")
1426 local file="$(basename ${@})" 1329 local file=$(basename "$*")
1427 local mline="" 1330 local mline=""
1428 local showedmsg=0 1331 local showedmsg=0
1429 1332
1430 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1333 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do
1431 [[ -d ${mline}/${dir} ]] || continue 1334 [[ -d ${mline}/${dir} ]] || continue
1432 [[ ! -z $(find ${mline}/${dir} -iname ${file} -maxdepth 1) ]] \ 1335 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \
1433 && export CDROM_ROOT=${mline} 1336 && export CDROM_ROOT=${mline}
1434 done 1337 done
1435 1338
1436 if [[ -z ${CDROM_ROOT} ]] ; then 1339 if [[ -z ${CDROM_ROOT} ]] ; then
1437 echo 1340 echo
1452 fi 1355 fi
1453 showedmsg=1 1356 showedmsg=1
1454 fi 1357 fi
1455 einfo "Press return to scan for the cd again" 1358 einfo "Press return to scan for the cd again"
1456 einfo "or hit CTRL+C to abort the emerge." 1359 einfo "or hit CTRL+C to abort the emerge."
1360 echo
1361 einfo "If you are having trouble with the detection"
1362 einfo "of your CD, it is possible that you do not have"
1363 einfo "Joliet support enabled in your kernel. Please"
1364 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1457 read 1365 read
1458 fi 1366 fi
1459 done 1367 done
1460} 1368}
1461 1369
1471# directories and uses the intersection of the lists. 1379# directories and uses the intersection of the lists.
1472# The -u builds a list of po files found in all the 1380# The -u builds a list of po files found in all the
1473# directories and uses the union of the lists. 1381# directories and uses the union of the lists.
1474strip-linguas() { 1382strip-linguas() {
1475 local ls newls 1383 local ls newls
1476 if [ "$1" == "-i" ] || [ "$1" == "-u" ] ; then 1384 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1477 local op="$1"; shift 1385 local op=$1; shift
1478 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1386 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift
1479 local d f 1387 local d f
1480 for d in "$@" ; do 1388 for d in "$@" ; do
1481 if [ "${op}" == "-u" ] ; then 1389 if [[ ${op} == "-u" ]] ; then
1482 newls="${ls}" 1390 newls=${ls}
1483 else 1391 else
1484 newls="" 1392 newls=""
1485 fi 1393 fi
1486 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1394 for f in $(find "$d" -name '*.po' -printf '%f ') ; do
1487 if [ "${op}" == "-i" ] ; then 1395 if [[ ${op} == "-i" ]] ; then
1488 [ "${ls/ ${f} /}" != "${ls}" ] && newls="${newls} ${f}" 1396 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}"
1489 else 1397 else
1490 [ "${ls/ ${f} /}" == "${ls}" ] && newls="${newls} ${f}" 1398 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}"
1491 fi 1399 fi
1492 done 1400 done
1493 ls="${newls}" 1401 ls=${newls}
1494 done 1402 done
1495 ls="${ls//.po}" 1403 ls=${ls//.po}
1496 else 1404 else
1497 ls="$@" 1405 ls=$@
1498 fi 1406 fi
1499 1407
1500 ls=" ${ls} " 1408 ls=" ${ls} "
1501 newls="" 1409 newls=""
1502 for f in ${LINGUAS} ; do 1410 for f in ${LINGUAS} ; do
1503 if [ "${ls/ ${f} /}" != "${ls}" ] ; then 1411 if [[ ${ls/ ${f} /} != ${ls} ]] ; then
1504 newls="${newls} ${f}" 1412 newls="${newls} ${f}"
1505 else 1413 else
1506 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1414 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA"
1507 fi 1415 fi
1508 done 1416 done
1509 if [ -z "${newls}" ] ; then 1417 if [[ -z ${newls} ]] ; then
1510 unset LINGUAS 1418 export LINGUAS=""
1511 else 1419 else
1512 export LINGUAS="${newls}" 1420 export LINGUAS=${newls:1}
1513 fi 1421 fi
1514} 1422}
1515 1423
1516# moved from kernel.eclass since they are generally useful outside of 1424# moved from kernel.eclass since they are generally useful outside of
1517# kernel.eclass -iggy (20041002) 1425# kernel.eclass -iggy (20041002)
1525 while ((i--)) ; do 1433 while ((i--)) ; do
1526 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass" 1434 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1527 done 1435 done
1528 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1436 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1529 case ${ARCH} in 1437 case ${ARCH} in
1530 x86) export ARCH="i386";; 1438 x86) export ARCH="i386";;
1531 amd64) export ARCH="x86_64";; 1439 amd64) export ARCH="x86_64";;
1532 hppa) export ARCH="parisc";; 1440 hppa) export ARCH="parisc";;
1533 mips) export ARCH="mips";; 1441 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! 1442 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}";; 1443 *) export ARCH="${ARCH}";;
1536 esac 1444 esac
1537} 1445}
1538 1446
1539# set's ARCH back to what portage expects 1447# set's ARCH back to what portage expects
1540set_arch_to_portage() { 1448set_arch_to_portage() {
1584 LIB=$1 1492 LIB=$1
1585 1493
1586 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1494 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1587 SONAME=`basename ${LIB}` 1495 SONAME=`basename ${LIB}`
1588 1496
1589 einfo "An old version of an installed library was detected on your system." 1497 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" 1498 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," 1499 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:" 1500 ewarn "you will need to execute the following command:"
1593 einfo " revdep-rebuild --soname ${SONAME}" 1501 ewarn " revdep-rebuild --soname ${SONAME}"
1594 einfo 1502 ewarn
1595 einfo "After doing that, you can safely remove ${LIB}" 1503 ewarn "After doing that, you can safely remove ${LIB}"
1596 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1504 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1597 fi 1505 fi
1598} 1506}
1599 1507
1600# Hack for people to figure out if a package was built with 1508# Hack for people to figure out if a package was built with
1601# certain USE flags 1509# certain USE flags
1639 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null 1547 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
1640 done 1548 done
1641 eend 0 1549 eend 0
1642} 1550}
1643 1551
1644# dopamd [ file ] [ new file ] 1552# dopamd <file> [more files]
1645# 1553#
1646# Install pam auth config file in /etc/pam.d 1554# 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() { 1555dopamd() {
1652 local pamd="$1" newpamd="${2:-$1}"
1653 [[ -z "$1" ]] && die "dopamd requires at least one argument." 1556 [[ -z $1 ]] && die "dopamd requires at least one argument"
1654 1557
1655 use pam || return 0 1558 use pam || return 0
1656 1559
1657 insinto /etc/pam.d 1560 INSDESTTREE=/etc/pam.d \
1658 # these are the default doins options, but be explicit just in case 1561 doins "$@" || die "failed to install $@"
1659 insopts -m 0644 -o root -g root
1660 newins ${pamd} ${newpamd} || die "failed to install ${newpamd}"
1661} 1562}
1563# newpamd <old name> <new name>
1564#
1565# Install pam file <old name> as <new name> in /etc/pam.d
1566newpamd() {
1567 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1568
1569 use pam || return 0
1570
1571 INSDESTTREE=/etc/pam.d \
1572 newins "$1" "$2" || die "failed to install $1 as $2"
1573}
1574
1575# make a wrapper script ...
1576# NOTE: this was originally games_make_wrapper, but I noticed other places where
1577# this could be used, so I have moved it here and made it not games-specific
1578# -- wolf31o2
1579# $1 == wrapper name
1580# $2 == binary to run
1581# $3 == directory to chdir before running binary
1582# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1583# $5 == path for wrapper
1584make_wrapper() {
1585 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1586 local tmpwrapper=$(emktemp)
1587 cat << EOF > "${tmpwrapper}"
1588#!/bin/sh
1589cd "${chdir}"
1590export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1591exec ${bin} "\$@"
1592EOF
1593 chmod go+rx "${tmpwrapper}"
1594 if [ -n "${5}" ]
1595 then
1596 exeinto ${5}
1597 newexe "${tmpwrapper}" "${wrapper}"
1598 else
1599 newbin "${tmpwrapper}" "${wrapper}"
1600 fi
1601}

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

  ViewVC Help
Powered by ViewVC 1.1.20