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

Diff of /eclass/eutils.eclass

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

Revision 1.163 Revision 1.212
1# Copyright 1999-2005 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.163 2005/03/26 06:33:16 eradicator Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.212 2005/10/22 02:32:48 vapier Exp $
4# 4#
5# Author: Martin Schlemmer <azarah@gentoo.org> 5# Author: Martin Schlemmer <azarah@gentoo.org>
6# 6#
7# This eclass is for general purpose functions that most ebuilds 7# This eclass is for general purpose functions that most ebuilds
8# have to implement themselves. 8# have to implement themselves.
9# 9#
10# NB: If you add anything, please comment it! 10# NB: If you add anything, please comment it!
11 11
12inherit multilib 12inherit multilib portability
13ECLASS=eutils
14INHERITED="$INHERITED $ECLASS"
15 13
16DEPEND="!bootstrap? ( sys-devel/patch )" 14DEPEND="!bootstrap? ( sys-devel/patch )"
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.
112 dodir /usr/${libdir} 67 dodir /usr/${libdir}
113 68
114 for lib in "${@}" ; do 69 for lib in "${@}" ; do
115 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT 70 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT
116 /* GNU ld script 71 /* GNU ld script
117 Since Gentoo has critical dynamic libraries 72 Since Gentoo has critical dynamic libraries
118 in /lib, and the static versions in /usr/lib, 73 in /lib, and the static versions in /usr/lib,
119 we need to have a "fake" dynamic lib in /usr/lib, 74 we need to have a "fake" dynamic lib in /usr/lib,
120 otherwise we run into linking problems. 75 otherwise we run into linking problems.
121 76
122 See bug http://bugs.gentoo.org/4411 for more info. 77 See bug http://bugs.gentoo.org/4411 for more info.
123 */ 78 */
124 GROUP ( /${libdir}/${lib} ) 79 GROUP ( /${libdir}/${lib} )
125 END_LDSCRIPT 80 END_LDSCRIPT
126 fperms a+x "/usr/${libdir}/${lib}" 81 fperms a+x "/usr/${libdir}/${lib}"
127 done 82 done
128} 83}
129 84
130# 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()
131# 87#
132# <azarah@gentoo.org> (11 Nov 2002) 88# <azarah@gentoo.org> (11 Nov 2002)
133# 89#
134draw_line() { 90draw_line() {
135 local i=0 91 local i=0
161EPATCH_SOURCE="${WORKDIR}/patch" 117EPATCH_SOURCE="${WORKDIR}/patch"
162# Default extension for patches 118# Default extension for patches
163EPATCH_SUFFIX="patch.bz2" 119EPATCH_SUFFIX="patch.bz2"
164# Default options for patch 120# Default options for patch
165# 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
166EPATCH_OPTS="-g0" 122# Set --no-backup-if-mismatch so we don't leave '.orig' files behind.
123EPATCH_OPTS="-g0 --no-backup-if-mismatch"
167# 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,
168# and not the full path .. 125# and not the full path ..
169EPATCH_EXCLUDE="" 126EPATCH_EXCLUDE=""
170# Change the printed message for a single patch. 127# Change the printed message for a single patch.
171EPATCH_SINGLE_MSG="" 128EPATCH_SINGLE_MSG=""
129# Change the printed message for multiple patches.
130EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..."
172# Force applying bulk patches even if not following the style: 131# Force applying bulk patches even if not following the style:
173# 132#
174# ??_${ARCH}_foo.${EPATCH_SUFFIX} 133# ??_${ARCH}_foo.${EPATCH_SUFFIX}
175# 134#
176EPATCH_FORCE="no" 135EPATCH_FORCE="no"
207# hand its a directory, it will set EPATCH_SOURCE to this. 166# hand its a directory, it will set EPATCH_SOURCE to this.
208# 167#
209# <azarah@gentoo.org> (10 Nov 2002) 168# <azarah@gentoo.org> (10 Nov 2002)
210# 169#
211epatch() { 170epatch() {
171 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; }
212 local PIPE_CMD="" 172 local PIPE_CMD=""
213 local STDERR_TARGET="${T}/$$.out" 173 local STDERR_TARGET="${T}/$$.out"
214 local PATCH_TARGET="${T}/$$.patch" 174 local PATCH_TARGET="${T}/$$.patch"
215 local PATCH_SUFFIX="" 175 local PATCH_SUFFIX=""
216 local SINGLE_PATCH="no" 176 local SINGLE_PATCH="no"
217 local x="" 177 local x=""
218 178
179 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
180
219 if [ "$#" -gt 1 ] 181 if [ "$#" -gt 1 ]
220 then 182 then
221 local m="" 183 local m=""
222 einfo "${#} patches to apply ..."
223 for m in "$@" ; do 184 for m in "$@" ; do
224 epatch "${m}" 185 epatch "${m}"
225 done 186 done
226 return 0 187 return 0
227 fi 188 fi
281 ;; 242 ;;
282 esac 243 esac
283 244
284 if [ "${SINGLE_PATCH}" = "no" ] 245 if [ "${SINGLE_PATCH}" = "no" ]
285 then 246 then
286 einfo "Applying various patches (bugfixes/updates) ..." 247 einfo "${EPATCH_MULTI_MSG}"
287 fi 248 fi
288 for x in ${EPATCH_SOURCE} 249 for x in ${EPATCH_SOURCE}
289 do 250 do
290 # New ARCH dependant patch naming scheme ... 251 # New ARCH dependant patch naming scheme ...
291 # 252 #
292 # ???_arch_foo.patch 253 # ???_arch_foo.patch
293 # 254 #
294 if [ -f ${x} ] && \ 255 if [ -f ${x} ] && \
295 ([ "${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}" ] || \
296 [ "${EPATCH_FORCE}" = "yes" ]) 257 [ "${EPATCH_FORCE}" = "yes" ])
297 then 258 then
298 local count=0 259 local count=0
299 local popts="${EPATCH_OPTS}" 260 local popts="${EPATCH_OPTS}"
300 local patchname=${x##*/} 261 local patchname=${x##*/}
353 count=5 314 count=5
354 break 315 break
355 fi 316 fi
356 fi 317 fi
357 318
358 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
359 then 320 then
360 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 321 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
361 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 322 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
362 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 323 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
363 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 324 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
364 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 325 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
365 326
366 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
367 329
368 if [ "$?" -ne 0 ] 330 if [ "$?" -ne 0 ]
369 then 331 then
370 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##*/}
371 echo 333 echo
410 then 372 then
411 einfo "Done with patching" 373 einfo "Done with patching"
412 fi 374 fi
413} 375}
414 376
415# This function return true if we are using the NPTL pthreads
416# implementation.
417#
418# <azarah@gentoo.org> (06 March 2003)
419#
420have_NPTL() {
421 cat > ${T}/test-nptl.c <<-"END"
422 #define _XOPEN_SOURCE
423 #include <unistd.h>
424 #include <stdio.h>
425
426 int main()
427 {
428 char buf[255];
429 char *str = buf;
430
431 confstr(_CS_GNU_LIBPTHREAD_VERSION, str, 255);
432 if (NULL != str) {
433 printf("%s\n", str);
434 if (NULL != strstr(str, "NPTL"))
435 return 0;
436 }
437
438 return 1;
439 }
440 END
441
442 einfon "Checking for _CS_GNU_LIBPTHREAD_VERSION support in glibc ..."
443 if gcc -o ${T}/nptl ${T}/test-nptl.c &> /dev/null
444 then
445 echo "yes"
446 einfon "Checking what PTHREADS implementation we have ..."
447 if ${T}/nptl
448 then
449 return 0
450 else
451 return 1
452 fi
453 else
454 echo "no"
455 fi
456
457 return 1
458}
459
460# This function check how many cpu's are present, and then set
461# -j in MAKEOPTS accordingly.
462#
463# Thanks to nall <nall@gentoo.org> for this.
464#
465get_number_of_jobs() {
466 local jobs=0
467
468 if [ ! -r /proc/cpuinfo ]
469 then
470 return 1
471 fi
472
473 # This bit is from H?kan Wessberg <nacka-gentoo@refug.org>, bug #13565.
474 if [ "`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | wc -l`" -gt 0 ]
475 then
476 ADMINOPTS="`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | cut -d= -f2 | sed 's/\"//g'`"
477 ADMINPARAM="`echo ${ADMINOPTS} | gawk '{match($0, /-j *[0-9]*/, opt); print opt[0]}'`"
478 ADMINPARAM="${ADMINPARAM/-j}"
479 fi
480
481 export MAKEOPTS="`echo ${MAKEOPTS} | sed -e 's:-j *[0-9]*::g'`"
482
483 if [ "${ARCH}" = "amd64" -o "${ARCH}" = "x86" -o "${ARCH}" = "hppa" -o \
484 "${ARCH}" = "arm" -o "${ARCH}" = "mips" -o "${ARCH}" = "ia64" ]
485 then
486 # these archs will always have "[Pp]rocessor"
487 jobs="$((`grep -c ^[Pp]rocessor /proc/cpuinfo` * 2))"
488
489 elif [ "${ARCH}" = "sparc" -o "${ARCH}" = "sparc64" ]
490 then
491 # sparc always has "ncpus active"
492 jobs="$((`grep "^ncpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
493
494 elif [ "${ARCH}" = "alpha" ]
495 then
496 # alpha has "cpus active", but only when compiled with SMP
497 if [ "`grep -c "^cpus active" /proc/cpuinfo`" -eq 1 ]
498 then
499 jobs="$((`grep "^cpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
500 else
501 jobs=2
502 fi
503
504 elif [ "${ARCH}" = "ppc" -o "${ARCH}" = "ppc64" ]
505 then
506 # ppc has "processor", but only when compiled with SMP
507 if [ "`grep -c "^processor" /proc/cpuinfo`" -eq 1 ]
508 then
509 jobs="$((`grep -c ^processor /proc/cpuinfo` * 2))"
510 else
511 jobs=2
512 fi
513 elif [ "${ARCH}" = "s390" ]
514 then
515 # s390 has "# processors : "
516 jobs="$((`grep "^\# processors" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
517 else
518 jobs="$((`grep -c ^cpu /proc/cpuinfo` * 2))"
519 die "Unknown ARCH -- ${ARCH}!"
520 fi
521
522 # Make sure the number is valid ...
523 if [ "${jobs}" -lt 1 ]
524 then
525 jobs=1
526 fi
527
528 if [ -n "${ADMINPARAM}" ]
529 then
530 if [ "${jobs}" -gt "${ADMINPARAM}" ]
531 then
532 einfo "Setting make jobs to \"-j${ADMINPARAM}\" to ensure successful merge ..."
533 export MAKEOPTS="${MAKEOPTS} -j${ADMINPARAM}"
534 else
535 einfo "Setting make jobs to \"-j${jobs}\" to ensure successful merge ..."
536 export MAKEOPTS="${MAKEOPTS} -j${jobs}"
537 fi
538 fi
539}
540
541# Cheap replacement for when debianutils (and thus mktemp) 377# Cheap replacement for when debianutils (and thus mktemp)
542# does not exist on the users system 378# does not exist on the users system
543# vapier@gentoo.org 379# vapier@gentoo.org
544# 380#
545# Takes just 1 optional parameter (the directory to create tmpfile in) 381# Takes just 1 optional parameter (the directory to create tmpfile in)
546emktemp() { 382emktemp() {
547 local exe="touch" 383 local exe="touch"
548 [ "$1" == "-d" ] && exe="mkdir" && shift 384 [[ $1 == -d ]] && exe="mkdir" && shift
549 local topdir="$1" 385 local topdir=$1
550 386
551 if [ -z "${topdir}" ] 387 if [[ -z ${topdir} ]] ; then
552 then
553 [ -z "${T}" ] \ 388 [[ -z ${T} ]] \
554 && topdir="/tmp" \ 389 && topdir="/tmp" \
555 || topdir="${T}" 390 || topdir=${T}
556 fi 391 fi
557 392
558 if [ -z "$(type -p mktemp)" ] 393 if [[ -z $(type -p mktemp) ]] ; then
559 then
560 local tmp=/ 394 local tmp=/
561 while [ -e "${tmp}" ] ; do 395 while [[ -e ${tmp} ]] ; do
562 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 396 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
563 done 397 done
564 ${exe} "${tmp}" 398 ${exe} "${tmp}" || ${exe} -p "${tmp}"
565 echo "${tmp}" 399 echo "${tmp}"
566 else 400 else
567 [ "${exe}" == "touch" ] \ 401 [[ ${exe} == "touch" ]] \
568 && exe="-p" \ 402 && exe="-p" \
569 || exe="-d" 403 || exe="-d"
570 mktemp ${exe} "${topdir}" 404 mktemp ${exe} "${topdir}"
571 fi 405 fi
572} 406}
576# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 410# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
577# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 411# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
578# 412#
579# egetent(database, key) 413# egetent(database, key)
580egetent() { 414egetent() {
581 if useq ppc-macos ; then 415 case ${CHOST} in
416 *-darwin*)
582 case "$2" in 417 case "$2" in
583 *[!0-9]*) # Non numeric 418 *[!0-9]*) # Non numeric
584 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 419 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
585 ;; 420 ;;
586 *) # Numeric 421 *) # Numeric
587 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 422 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
588 ;; 423 ;;
589 esac 424 esac
590 elif useq x86-fbsd ; then 425 ;;
591 local action 426 *-freebsd*)
592 if [ "$1" == "passwd" ] 427 local opts action="user"
593 then 428 [[ $1 == "passwd" ]] || action="group"
594 action="user" 429
595 else 430 # lookup by uid/gid
596 action="group" 431 if [[ $2 == [[:digit:]]* ]] ; then
432 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
597 fi 433 fi
434
598 pw show "${action}" "$2" -q 435 pw show ${action} ${opts} "$2" -q
599 else 436 ;;
437 *-netbsd*)
438 grep "$2:\*:" /etc/$1
439 ;;
440 *)
600 which nscd >& /dev/null && nscd -i "$1" 441 type -p nscd >& /dev/null && nscd -i "$1"
601 getent "$1" "$2" 442 getent "$1" "$2"
602 fi 443 ;;
444 esac
603} 445}
604 446
605# Simplify/standardize adding users to the system 447# Simplify/standardize adding users to the system
606# vapier@gentoo.org 448# vapier@gentoo.org
607# 449#
615# homedir: /dev/null 457# homedir: /dev/null
616# groups: none 458# groups: none
617# extra: comment of 'added by portage for ${PN}' 459# extra: comment of 'added by portage for ${PN}'
618enewuser() { 460enewuser() {
619 # get the username 461 # get the username
620 local euser="$1"; shift 462 local euser=$1; shift
621 if [ -z "${euser}" ] 463 if [[ -z ${euser} ]] ; then
622 then
623 eerror "No username specified !" 464 eerror "No username specified !"
624 die "Cannot call enewuser without a username" 465 die "Cannot call enewuser without a username"
625 fi 466 fi
626 467
627 # lets see if the username already exists 468 # lets see if the username already exists
628 if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ] 469 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then
629 then
630 return 0 470 return 0
631 fi 471 fi
632 einfo "Adding user '${euser}' to your system ..." 472 einfo "Adding user '${euser}' to your system ..."
633 473
634 # options to pass to useradd 474 # options to pass to useradd
635 local opts= 475 local opts=
636 476
637 # handle uid 477 # handle uid
638 local euid="$1"; shift 478 local euid=$1; shift
639 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] 479 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then
640 then
641 if [ "${euid}" -gt 0 ] 480 if [[ ${euid} -gt 0 ]] ; then
642 then
643 if [ ! -z "`egetent passwd ${euid}`" ] 481 if [[ ! -z $(egetent passwd ${euid}) ]] ; then
644 then
645 euid="next" 482 euid="next"
646 fi 483 fi
647 else 484 else
648 eerror "Userid given but is not greater than 0 !" 485 eerror "Userid given but is not greater than 0 !"
649 die "${euid} is not a valid UID" 486 die "${euid} is not a valid UID"
650 fi 487 fi
651 else 488 else
652 euid="next" 489 euid="next"
653 fi 490 fi
654 if [ "${euid}" == "next" ] 491 if [[ ${euid} == "next" ]] ; then
655 then 492 for euid in $(seq 101 999) ; do
656 local pwrange
657 if [ "${USERLAND}" == "BSD" ] ; then
658 pwrange="`jot 898 101`"
659 else
660 pwrange="`seq 101 999`"
661 fi
662 for euid in ${pwrange} ; do
663 [ -z "`egetent passwd ${euid}`" ] && break 493 [[ -z $(egetent passwd ${euid}) ]] && break
664 done 494 done
665 fi 495 fi
666 opts="${opts} -u ${euid}" 496 opts="${opts} -u ${euid}"
667 einfo " - Userid: ${euid}" 497 einfo " - Userid: ${euid}"
668 498
669 # handle shell 499 # handle shell
670 local eshell="$1"; shift 500 local eshell=$1; shift
671 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ] 501 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
672 then
673 if [ ! -e "${eshell}" ] 502 if [[ ! -e ${eshell} ]] ; then
674 then
675 eerror "A shell was specified but it does not exist !" 503 eerror "A shell was specified but it does not exist !"
676 die "${eshell} does not exist" 504 die "${eshell} does not exist"
677 fi 505 fi
678 else 506 else
679 if [ "${USERLAND}" == "BSD" ] 507 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
680 then 508 [[ -x ${ROOT}${shell} ]] && break
681 eshell="/usr/bin/false" 509 done
682 else 510
683 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"
684 fi 514 fi
515
516 eshell=${shell}
685 fi 517 fi
686 einfo " - Shell: ${eshell}" 518 einfo " - Shell: ${eshell}"
687 opts="${opts} -s ${eshell}" 519 opts="${opts} -s ${eshell}"
688 520
689 # handle homedir 521 # handle homedir
690 local ehome="$1"; shift 522 local ehome=$1; shift
691 if [ -z "${ehome}" ] && [ "${eshell}" != "-1" ] 523 if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then
692 then
693 ehome="/dev/null" 524 ehome="/dev/null"
694 fi 525 fi
695 einfo " - Home: ${ehome}" 526 einfo " - Home: ${ehome}"
696 opts="${opts} -d ${ehome}" 527 opts="${opts} -d ${ehome}"
697 528
698 # handle groups 529 # handle groups
699 local egroups="$1"; shift 530 local egroups=$1; shift
700 if [ ! -z "${egroups}" ] 531 if [[ ! -z ${egroups} ]] ; then
701 then
702 local oldifs="${IFS}" 532 local oldifs=${IFS}
703 local defgroup="" exgroups="" 533 local defgroup="" exgroups=""
704 534
705 export IFS="," 535 export IFS=","
706 for g in ${egroups} 536 for g in ${egroups} ; do
707 do
708 export IFS="${oldifs}" 537 export IFS=${oldifs}
709 if [ -z "`egetent group \"${g}\"`" ] 538 if [[ -z $(egetent group "${g}") ]] ; then
710 then
711 eerror "You must add group ${g} to the system first" 539 eerror "You must add group ${g} to the system first"
712 die "${g} is not a valid GID" 540 die "${g} is not a valid GID"
713 fi 541 fi
714 if [ -z "${defgroup}" ] 542 if [[ -z ${defgroup} ]] ; then
715 then
716 defgroup="${g}" 543 defgroup=${g}
717 else 544 else
718 exgroups="${exgroups},${g}" 545 exgroups="${exgroups},${g}"
719 fi 546 fi
720 export IFS="," 547 export IFS=","
721 done 548 done
722 export IFS="${oldifs}" 549 export IFS=${oldifs}
723 550
724 opts="${opts} -g ${defgroup}" 551 opts="${opts} -g ${defgroup}"
725 if [ ! -z "${exgroups}" ] 552 if [[ ! -z ${exgroups} ]] ; then
726 then
727 opts="${opts} -G ${exgroups:1}" 553 opts="${opts} -G ${exgroups:1}"
728 fi 554 fi
729 else 555 else
730 egroups="(none)" 556 egroups="(none)"
731 fi 557 fi
732 einfo " - Groups: ${egroups}" 558 einfo " - Groups: ${egroups}"
733 559
734 # handle extra and add the user 560 # handle extra and add the user
735 local eextra="$@"
736 local oldsandbox="${SANDBOX_ON}" 561 local oldsandbox=${SANDBOX_ON}
737 export SANDBOX_ON="0" 562 export SANDBOX_ON="0"
738 if useq ppc-macos 563 case ${CHOST} in
739 then 564 *-darwin*)
740 ### Make the user 565 ### Make the user
741 if [ -z "${eextra}" ] 566 if [[ -z $@ ]] ; then
742 then
743 dscl . create /users/${euser} uid ${euid} 567 dscl . create /users/${euser} uid ${euid}
744 dscl . create /users/${euser} shell ${eshell} 568 dscl . create /users/${euser} shell ${eshell}
745 dscl . create /users/${euser} home ${ehome} 569 dscl . create /users/${euser} home ${ehome}
746 dscl . create /users/${euser} realname "added by portage for ${PN}" 570 dscl . create /users/${euser} realname "added by portage for ${PN}"
747 ### Add the user to the groups specified 571 ### Add the user to the groups specified
748 local oldifs="${IFS}" 572 local oldifs=${IFS}
749 export IFS="," 573 export IFS=","
750 for g in ${egroups} 574 for g in ${egroups} ; do
751 do
752 dscl . merge /groups/${g} users ${euser} 575 dscl . merge /groups/${g} users ${euser}
753 done 576 done
754 export IFS="${oldifs}" 577 export IFS=${oldifs}
755 else 578 else
756 einfo "Extra options are not supported on macos yet" 579 einfo "Extra options are not supported on Darwin yet"
757 einfo "Please report the ebuild along with the info below" 580 einfo "Please report the ebuild along with the info below"
758 einfo "eextra: ${eextra}" 581 einfo "eextra: $@"
759 die "Required function missing" 582 die "Required function missing"
760 fi 583 fi
761 elif use x86-fbsd ; then 584 ;;
762 if [ -z "${eextra}" ] 585 *-freebsd*)
763 then 586 if [[ -z $@ ]] ; then
764 pw useradd ${euser} ${opts} \ 587 pw useradd ${euser} ${opts} \
765 -c "added by portage for ${PN}" \ 588 -c "added by portage for ${PN}" \
766 die "enewuser failed" 589 die "enewuser failed"
767 else 590 else
768 einfo " - Extra: ${eextra}" 591 einfo " - Extra: $@"
769 pw useradd ${euser} ${opts} \ 592 pw useradd ${euser} ${opts} \
770 -c ${eextra} || die "enewuser failed" 593 "$@" || die "enewuser failed"
771 fi 594 fi
595 ;;
596
597 *-netbsd*)
598 if [[ -z $@ ]] ; then
599 useradd ${opts} ${euser} || die "enewuser failed"
772 else 600 else
773 if [ -z "${eextra}" ] 601 einfo " - Extra: $@"
774 then 602 useradd ${opts} ${euser} "$@" || die "enewuser failed"
603 fi
604 ;;
605 *)
606 if [[ -z $@ ]] ; then
775 useradd ${opts} ${euser} \ 607 useradd ${opts} ${euser} \
776 -c "added by portage for ${PN}" \ 608 -c "added by portage for ${PN}" \
777 || die "enewuser failed" 609 || die "enewuser failed"
778 else 610 else
779 einfo " - Extra: ${eextra}" 611 einfo " - Extra: $@"
780 useradd ${opts} ${euser} ${eextra} \ 612 useradd ${opts} ${euser} "$@" \
781 || die "enewuser failed" 613 || die "enewuser failed"
782 fi 614 fi
615 ;;
616 esac
617
618 if [[ ! -e ${ROOT}/${ehome} ]] ; then
619 einfo " - Creating ${ehome} in ${ROOT}"
620 mkdir -p "${ROOT}/${ehome}"
621 chown ${euser} "${ROOT}/${ehome}"
622 chmod 755 "${ROOT}/${ehome}"
783 fi 623 fi
624
784 export SANDBOX_ON="${oldsandbox}" 625 export SANDBOX_ON=${oldsandbox}
785
786 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ]
787 then
788 einfo " - Creating ${ehome} in ${D}"
789 dodir ${ehome}
790 fowners ${euser} ${ehome}
791 fperms 755 ${ehome}
792 fi
793} 626}
794 627
795# Simplify/standardize adding groups to the system 628# Simplify/standardize adding groups to the system
796# vapier@gentoo.org 629# vapier@gentoo.org
797# 630#
826 then 659 then
827 if [ "${egid}" -gt 0 ] 660 if [ "${egid}" -gt 0 ]
828 then 661 then
829 if [ -z "`egetent group ${egid}`" ] 662 if [ -z "`egetent group ${egid}`" ]
830 then 663 then
831 if useq ppc-macos ; then 664 if [[ "${CHOST}" == *-darwin* ]]; then
832 opts="${opts} ${egid}" 665 opts="${opts} ${egid}"
833 else 666 else
834 opts="${opts} -g ${egid}" 667 opts="${opts} -g ${egid}"
835 fi 668 fi
836 else 669 else
850 opts="${opts} ${eextra}" 683 opts="${opts} ${eextra}"
851 684
852 # add the group 685 # add the group
853 local oldsandbox="${SANDBOX_ON}" 686 local oldsandbox="${SANDBOX_ON}"
854 export SANDBOX_ON="0" 687 export SANDBOX_ON="0"
855 if useq ppc-macos ; then 688 case ${CHOST} in
689 *-darwin*)
856 if [ ! -z "${eextra}" ]; 690 if [ ! -z "${eextra}" ];
857 then 691 then
858 einfo "Extra options are not supported on macos yet" 692 einfo "Extra options are not supported on Darwin/OS X yet"
859 einfo "Please report the ebuild along with the info below" 693 einfo "Please report the ebuild along with the info below"
860 einfo "eextra: ${eextra}" 694 einfo "eextra: ${eextra}"
861 die "Required function missing" 695 die "Required function missing"
862 fi 696 fi
863 697
864 # If we need the next available 698 # If we need the next available
865 case ${egid} in 699 case ${egid} in
866 *[!0-9]*) # Non numeric 700 *[!0-9]*) # Non numeric
867 for egid in `jot 898 101`; do 701 for egid in $(seq 101 999); do
868 [ -z "`egetent group ${egid}`" ] && break 702 [ -z "`egetent group ${egid}`" ] && break
869 done 703 done
870 esac 704 esac
871 dscl . create /groups/${egroup} gid ${egid} 705 dscl . create /groups/${egroup} gid ${egid}
872 dscl . create /groups/${egroup} passwd '*' 706 dscl . create /groups/${egroup} passwd '*'
873 elif use x86-fbsd ; then 707 ;;
708
709 *-freebsd*)
874 case ${egid} in 710 case ${egid} in
875 *[!0-9]*) # Non numeric 711 *[!0-9]*) # Non numeric
876 for egid in `jot 898 101`; do 712 for egid in $(seq 101 999); do
877 [ -z "`egetent group ${egid}`" ] && break 713 [ -z "`egetent group ${egid}`" ] && break
878 done 714 done
879 esac 715 esac
880 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 716 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
881 else 717 ;;
718
719 *-netbsd*)
720 case ${egid} in
721 *[!0-9]*) # Non numeric
722 for egid in $(seq 101 999); do
723 [ -z "`egetent group ${egid}`" ] && break
724 done
725 esac
726 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
727 ;;
728
729 *)
882 groupadd ${opts} ${egroup} || die "enewgroup failed" 730 groupadd ${opts} ${egroup} || die "enewgroup failed"
883 fi 731 ;;
732 esac
884 export SANDBOX_ON="${oldsandbox}" 733 export SANDBOX_ON="${oldsandbox}"
885} 734}
886 735
887# Simple script to replace 'dos2unix' binaries 736# Simple script to replace 'dos2unix' binaries
888# vapier@gentoo.org 737# vapier@gentoo.org
913# name: the name that will show up in the menu 762# name: the name that will show up in the menu
914# icon: give your little like a pretty little icon ... 763# icon: give your little like a pretty little icon ...
915# this can be relative (to /usr/share/pixmaps) or 764# this can be relative (to /usr/share/pixmaps) or
916# a full path to an icon 765# a full path to an icon
917# type: what kind of application is this ? for categories: 766# type: what kind of application is this ? for categories:
918# http://www.freedesktop.org/wiki/Standards_2fmenu_2dspec 767# http://www.freedesktop.org/Standards/desktop-entry-spec
919# path: if your app needs to startup in a specific dir 768# path: if your app needs to startup in a specific dir
920make_desktop_entry() { 769make_desktop_entry() {
921 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1 770 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
922 771
923 local exec=${1} 772 local exec=${1}
949 dev) 798 dev)
950 type="Development" 799 type="Development"
951 ;; 800 ;;
952 801
953 games) 802 games)
954 [[ -z ${path} ]] && path=${GAMES_BINDIR}
955
956 case ${catmin} in 803 case ${catmin} in
957 action) type=ActionGame;; 804 action) type=ActionGame;;
958 arcade) type=ArcadeGame;; 805 arcade) type=ArcadeGame;;
959 board) type=BoardGame;; 806 board) type=BoardGame;;
960 kid) type=KidsGame;; 807 kid) type=KidsGame;;
1025 *) 872 *)
1026 type= 873 type=
1027 ;; 874 ;;
1028 esac 875 esac
1029 fi 876 fi
1030 877 if [ "${SLOT}" == "0" ] ; then
878 local desktop_name="${PN}"
879 else
880 local desktop_name="${PN}-${SLOT}"
881 fi
1031 local desktop=${T}/${exec%% *}-${P}.desktop 882 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
1032 883
1033echo "[Desktop Entry] 884echo "[Desktop Entry]
1034Encoding=UTF-8 885Encoding=UTF-8
1035Version=0.9.2 886Version=0.9.2
1036Name=${name} 887Name=${name}
1039Exec=${exec} 890Exec=${exec}
1040Path=${path} 891Path=${path}
1041Icon=${icon} 892Icon=${icon}
1042Categories=Application;${type};" > "${desktop}" 893Categories=Application;${type};" > "${desktop}"
1043 894
895 (
896 # wrap the env here so that the 'insinto' call
897 # doesn't corrupt the env of the caller
1044 insinto /usr/share/applications 898 insinto /usr/share/applications
1045 doins "${desktop}" 899 doins "${desktop}"
1046 900 )
1047 return 0
1048} 901}
1049 902
1050# Make a GDM/KDM Session file 903# Make a GDM/KDM Session file
1051# 904#
1052# make_desktop_entry(<title>, <command>) 905# make_desktop_entry(<title>, <command>)
1053# title: File to execute to start the Window Manager 906# title: File to execute to start the Window Manager
1054# command: Name of the Window Manager 907# command: Name of the Window Manager
1055 908
1056make_session_desktop() { 909make_session_desktop() {
1057
1058 [ -z "$1" ] && eerror "make_session_desktop: You must specify the title" && return 1 910 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1
1059 [ -z "$2" ] && eerror "make_session_desktop: You must specify the command" && return 1 911 [[ -z $2 ]] && eerror "make_session_desktop: You must specify the command" && return 1
1060 912
1061 local title="${1}" 913 local title=$1
1062 local command="${2}" 914 local command=$2
1063 local desktop="${T}/${wm}.desktop" 915 local desktop=${T}/${wm}.desktop
1064 916
1065echo "[Desktop Entry] 917echo "[Desktop Entry]
1066Encoding=UTF-8 918Encoding=UTF-8
1067Name=${title} 919Name=${title}
1068Comment=This session logs you into ${title} 920Comment=This session logs you into ${title}
1070TryExec=${command} 922TryExec=${command}
1071Type=Application" > "${desktop}" 923Type=Application" > "${desktop}"
1072 924
1073 insinto /usr/share/xsessions 925 insinto /usr/share/xsessions
1074 doins "${desktop}" 926 doins "${desktop}"
1075
1076 return 0
1077} 927}
1078 928
1079domenu() { 929domenu() {
1080 local i 930 local i j
1081 local j
1082 insinto /usr/share/applications 931 insinto /usr/share/applications
1083 for i in ${@} 932 for i in "$@" ; do
1084 do
1085 if [ -f "${i}" ]; 933 if [[ -f ${i} ]] ; then
1086 then
1087 doins ${i} 934 doins "${i}"
1088 elif [ -d "${i}" ]; 935 elif [[ -d ${i} ]] ; then
1089 then
1090 for j in ${i}/*.desktop 936 for j in "${i}"/*.desktop ; do
1091 do
1092 doins ${j} 937 doins "${j}"
1093 done 938 done
1094 fi 939 fi
1095 done 940 done
1096} 941}
942newmenu() {
943 insinto /usr/share/applications
944 newins "$1" "$2"
945}
1097 946
1098doicon() { 947doicon() {
1099 local i 948 local i j
1100 local j
1101 insinto /usr/share/pixmaps 949 insinto /usr/share/pixmaps
1102 for i in ${@} 950 for i in "$@" ; do
1103 do
1104 if [ -f "${i}" ]; 951 if [[ -f ${i} ]] ; then
1105 then
1106 doins ${i} 952 doins "${i}"
1107 elif [ -d "${i}" ]; 953 elif [[ -d ${i} ]] ; then
1108 then
1109 for j in ${i}/*.png 954 for j in "${i}"/*.png ; do
1110 do
1111 doins ${j} 955 doins "${j}"
1112 done 956 done
1113 fi 957 fi
1114 done 958 done
959}
960newicon() {
961 insinto /usr/share/pixmaps
962 newins "$1" "$2"
1115} 963}
1116 964
1117############################################################## 965##############################################################
1118# END: Handle .desktop files and menu entries # 966# END: Handle .desktop files and menu entries #
1119############################################################## 967##############################################################
1120 968
1121 969
1122# for internal use only (unpack_pdv and unpack_makeself) 970# for internal use only (unpack_pdv and unpack_makeself)
1123find_unpackable_file() { 971find_unpackable_file() {
1124 local src="$1" 972 local src=$1
1125 if [ -z "${src}" ] 973 if [[ -z ${src} ]] ; then
1126 then
1127 src="${DISTDIR}/${A}" 974 src=${DISTDIR}/${A}
1128 else 975 else
1129 if [ -e "${DISTDIR}/${src}" ] 976 if [[ -e ${DISTDIR}/${src} ]] ; then
1130 then
1131 src="${DISTDIR}/${src}" 977 src=${DISTDIR}/${src}
1132 elif [ -e "${PWD}/${src}" ] 978 elif [[ -e ${PWD}/${src} ]] ; then
1133 then
1134 src="${PWD}/${src}" 979 src=${PWD}/${src}
1135 elif [ -e "${src}" ] 980 elif [[ -e ${src} ]] ; then
1136 then
1137 src="${src}" 981 src=${src}
1138 fi
1139 fi 982 fi
1140 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 983 fi
984 [[ ! -e ${src} ]] && return 1
1141 echo "${src}" 985 echo "${src}"
1142} 986}
1143 987
1144# Unpack those pesky pdv generated files ... 988# Unpack those pesky pdv generated files ...
1145# They're self-unpacking programs with the binary package stuffed in 989# They're self-unpacking programs with the binary package stuffed in
1160# lseek 1004# lseek
1161# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1005# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
1162# lseek(3, -4, SEEK_END) = 2981250 1006# lseek(3, -4, SEEK_END) = 2981250
1163# thus we would pass in the value of '4' as the second parameter. 1007# thus we would pass in the value of '4' as the second parameter.
1164unpack_pdv() { 1008unpack_pdv() {
1165 local src="`find_unpackable_file $1`" 1009 local src=$(find_unpackable_file $1)
1166 local sizeoff_t="$2" 1010 local sizeoff_t=$2
1167 1011
1012 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1168 [ -z "${sizeoff_t}" ] && die "No idea what off_t size was used for this pdv :(" 1013 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
1169 1014
1170 local shrtsrc="`basename ${src}`" 1015 local shrtsrc=$(basename "${src}")
1171 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1016 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1172 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1017 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
1173 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"` 1018 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
1174 1019
1175 # grab metadata for debug reasons 1020 # grab metadata for debug reasons
1239# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1084# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1240# - If the file is not specified then unpack will utilize ${A}. 1085# - If the file is not specified then unpack will utilize ${A}.
1241# - If the offset is not specified then we will attempt to extract 1086# - If the offset is not specified then we will attempt to extract
1242# the proper offset from the script itself. 1087# the proper offset from the script itself.
1243unpack_makeself() { 1088unpack_makeself() {
1244 local src="$(find_unpackable_file "$1")" 1089 local src=$(find_unpackable_file "$1")
1245 local skip="$2" 1090 local skip=$2
1246 local exe="$3" 1091 local exe=$3
1247 1092
1093 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1094
1248 local shrtsrc="$(basename "${src}")" 1095 local shrtsrc=$(basename "${src}")
1249 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1096 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1250 if [ -z "${skip}" ] 1097 if [[ -z ${skip} ]] ; then
1251 then
1252 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1098 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1253 local skip=0 1099 local skip=0
1254 exe=tail 1100 exe=tail
1255 case ${ver} in 1101 case ${ver} in
1256 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1102 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
1257 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1103 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1269 ;; 1115 ;;
1270 2.1.3) 1116 2.1.3)
1271 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1117 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1272 let skip="skip + 1" 1118 let skip="skip + 1"
1273 ;; 1119 ;;
1274 2.1.4) 1120 2.1.4|2.1.5)
1275 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1) 1121 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
1276 skip=$(head -n ${skip} "${src}" | wc -c) 1122 skip=$(head -n ${skip} "${src}" | wc -c)
1277 exe="dd" 1123 exe="dd"
1278 ;; 1124 ;;
1279 *) 1125 *)
1324check_license() { 1170check_license() {
1325 local lic=$1 1171 local lic=$1
1326 if [ -z "${lic}" ] ; then 1172 if [ -z "${lic}" ] ; then
1327 lic="${PORTDIR}/licenses/${LICENSE}" 1173 lic="${PORTDIR}/licenses/${LICENSE}"
1328 else 1174 else
1329 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1175 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1330 lic="${PORTDIR}/licenses/${src}" 1176 lic="${PORTDIR}/licenses/${lic}"
1331 elif [ -e "${PWD}/${src}" ] ; then 1177 elif [ -e "${PWD}/${lic}" ] ; then
1332 lic="${PWD}/${src}" 1178 lic="${PWD}/${lic}"
1333 elif [ -e "${src}" ] ; then 1179 elif [ -e "${lic}" ] ; then
1334 lic="${src}" 1180 lic="${lic}"
1335 fi
1336 fi 1181 fi
1182 fi
1337 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1183 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1338 local l="`basename ${lic}`" 1184 local l="`basename ${lic}`"
1339 1185
1340 # here is where we check for the licenses the user already 1186 # here is where we check for the licenses the user already
1341 # accepted ... if we don't find a match, we make the user accept 1187 # accepted ... if we don't find a match, we make the user accept
1342 local shopts=$- 1188 local shopts=$-
1513# displayed and we'll hang out here until: 1359# displayed and we'll hang out here until:
1514# (1) the file is found on a mounted cdrom 1360# (1) the file is found on a mounted cdrom
1515# (2) the user hits CTRL+C 1361# (2) the user hits CTRL+C
1516cdrom_locate_file_on_cd() { 1362cdrom_locate_file_on_cd() {
1517 while [[ -z ${CDROM_ROOT} ]] ; do 1363 while [[ -z ${CDROM_ROOT} ]] ; do
1518 local dir="$(dirname ${@})" 1364 local dir=$(dirname "$*")
1519 local file="$(basename ${@})" 1365 local file=$(basename "$*")
1520 local mline="" 1366 local mline=""
1521 local showedmsg=0 1367 local showedmsg=0
1522 1368
1523 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1369 for mline in $(mount | egrep -e '(iso|cdrom|fs=cdfss)' | awk '{print $3}') ; do
1524 [[ -d ${mline}/${dir} ]] || continue 1370 [[ -d ${mline}/${dir} ]] || continue
1525 [[ ! -z $(find ${mline}/${dir} -iname ${file} -maxdepth 1) ]] \ 1371 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \
1526 && export CDROM_ROOT=${mline} 1372 && export CDROM_ROOT=${mline}
1527 done 1373 done
1528 1374
1529 if [[ -z ${CDROM_ROOT} ]] ; then 1375 if [[ -z ${CDROM_ROOT} ]] ; then
1530 echo 1376 echo
1545 fi 1391 fi
1546 showedmsg=1 1392 showedmsg=1
1547 fi 1393 fi
1548 einfo "Press return to scan for the cd again" 1394 einfo "Press return to scan for the cd again"
1549 einfo "or hit CTRL+C to abort the emerge." 1395 einfo "or hit CTRL+C to abort the emerge."
1396 echo
1397 einfo "If you are having trouble with the detection"
1398 einfo "of your CD, it is possible that you do not have"
1399 einfo "Joliet support enabled in your kernel. Please"
1400 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1550 read 1401 read
1551 fi 1402 fi
1552 done 1403 done
1553} 1404}
1554 1405
1598 else 1449 else
1599 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1450 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA"
1600 fi 1451 fi
1601 done 1452 done
1602 if [[ -z ${newls} ]] ; then 1453 if [[ -z ${newls} ]] ; then
1603 unset LINGUAS 1454 export LINGUAS=""
1604 else 1455 else
1605 export LINGUAS=${newls:1} 1456 export LINGUAS=${newls:1}
1606 fi 1457 fi
1607} 1458}
1608 1459
1618 while ((i--)) ; do 1469 while ((i--)) ; do
1619 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass" 1470 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1620 done 1471 done
1621 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1472 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1622 case ${ARCH} in 1473 case ${ARCH} in
1623 x86) export ARCH="i386";; 1474 x86) export ARCH="i386";;
1624 amd64) export ARCH="x86_64";; 1475 amd64) export ARCH="x86_64";;
1625 hppa) export ARCH="parisc";; 1476 hppa) export ARCH="parisc";;
1626 mips) export ARCH="mips";; 1477 mips) export ARCH="mips";;
1627 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! 1478 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!
1628 *) export ARCH="${ARCH}";; 1479 *) export ARCH="${ARCH}";;
1629 esac 1480 esac
1630} 1481}
1631 1482
1632# set's ARCH back to what portage expects 1483# set's ARCH back to what portage expects
1633set_arch_to_portage() { 1484set_arch_to_portage() {
1677 LIB=$1 1528 LIB=$1
1678 1529
1679 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1530 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1680 SONAME=`basename ${LIB}` 1531 SONAME=`basename ${LIB}`
1681 1532
1682 einfo "An old version of an installed library was detected on your system." 1533 ewarn "An old version of an installed library was detected on your system."
1683 einfo "In order to avoid breaking packages that link against is, this older version" 1534 ewarn "In order to avoid breaking packages that link against it, this older version"
1684 einfo "is not being removed. In order to make full use of this newer version," 1535 ewarn "is not being removed. In order to make full use of this newer version,"
1685 einfo "you will need to execute the following command:" 1536 ewarn "you will need to execute the following command:"
1686 einfo " revdep-rebuild --soname ${SONAME}" 1537 ewarn " revdep-rebuild --soname ${SONAME}"
1687 einfo 1538 ewarn
1688 einfo "After doing that, you can safely remove ${LIB}" 1539 ewarn "After doing that, you can safely remove ${LIB}"
1689 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1540 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1690 fi 1541 fi
1691} 1542}
1692 1543
1693# Hack for people to figure out if a package was built with 1544# Hack for people to figure out if a package was built with
1694# certain USE flags 1545# certain USE flags
1740dopamd() { 1591dopamd() {
1741 [[ -z $1 ]] && die "dopamd requires at least one argument" 1592 [[ -z $1 ]] && die "dopamd requires at least one argument"
1742 1593
1743 use pam || return 0 1594 use pam || return 0
1744 1595
1745 insinto /etc/pam.d 1596 INSDESTTREE=/etc/pam.d \
1746 doins "$@" || die "failed to install $@" 1597 doins "$@" || die "failed to install $@"
1747} 1598}
1748# newpamd <old name> <new name> 1599# newpamd <old name> <new name>
1749# 1600#
1750# Install pam file <old name> as <new name> in /etc/pam.d 1601# Install pam file <old name> as <new name> in /etc/pam.d
1751newpamd() { 1602newpamd() {
1752 [[ $# -ne 2 ]] && die "newpamd requires two arguements" 1603 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1753 1604
1754 use pam || return 0 1605 use pam || return 0
1755 1606
1756 insinto /etc/pam.d 1607 INSDESTTREE=/etc/pam.d \
1757 newins "$1" "$2" || die "failed to install $1 as $2" 1608 newins "$1" "$2" || die "failed to install $1 as $2"
1758} 1609}
1759 1610
1760# make a wrapper script ... 1611# make a wrapper script ...
1761# NOTE: this was originally games_make_wrapper, but I noticed other places where 1612# NOTE: this was originally games_make_wrapper, but I noticed other places where
1763# -- wolf31o2 1614# -- wolf31o2
1764# $1 == wrapper name 1615# $1 == wrapper name
1765# $2 == binary to run 1616# $2 == binary to run
1766# $3 == directory to chdir before running binary 1617# $3 == directory to chdir before running binary
1767# $4 == extra LD_LIBRARY_PATH's (make it : delimited) 1618# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1619# $5 == path for wrapper
1768make_wrapper() { 1620make_wrapper() {
1769 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 1621 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1770 local tmpwrapper=$(emktemp) 1622 local tmpwrapper=$(emktemp)
1623 # We don't want to quote ${bin} so that people can pass complex
1624 # things as $bin ... "./someprog --args"
1771 cat << EOF > "${tmpwrapper}" 1625 cat << EOF > "${tmpwrapper}"
1772#!/bin/sh 1626#!/bin/sh
1773cd "${chdir}" 1627cd "${chdir:-.}"
1628if [ -n "${libdir}" ] ; then
1629 if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
1774export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}" 1630 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1631 else
1632 export LD_LIBRARY_PATH="${libdir}"
1633 fi
1634fi
1775exec ${bin} "\$@" 1635exec ${bin} "\$@"
1776EOF 1636EOF
1777 chmod go+rx "${tmpwrapper}" 1637 chmod go+rx "${tmpwrapper}"
1638 if [[ -n ${path} ]] ; then
1639 exeinto "${path}"
1640 newexe "${tmpwrapper}" "${wrapper}"
1641 else
1778 newbin "${tmpwrapper}" "${wrapper}" 1642 newbin "${tmpwrapper}" "${wrapper}"
1643 fi
1779} 1644}

Legend:
Removed from v.1.163  
changed lines
  Added in v.1.212

  ViewVC Help
Powered by ViewVC 1.1.20