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

Diff of /eclass/eutils.eclass

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

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

Legend:
Removed from v.1.152  
changed lines
  Added in v.1.218

  ViewVC Help
Powered by ViewVC 1.1.20