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

Diff of /eclass/eutils.eclass

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

Revision 1.157 Revision 1.199
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.157 2005/03/07 17:45:07 carlo Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.199 2005/09/22 14:52:36 wolf31o2 Exp $
4# 4#
5# Author: Martin Schlemmer <azarah@gentoo.org> 5# Author: Martin Schlemmer <azarah@gentoo.org>
6# 6#
7# This eclass is for general purpose functions that most ebuilds 7# This eclass is for general purpose functions that most ebuilds
8# have to implement themselves. 8# have to implement themselves.
9# 9#
10# NB: If you add anything, please comment it! 10# NB: If you add anything, please comment it!
11 11
12inherit multilib 12inherit multilib portability
13ECLASS=eutils
14INHERITED="$INHERITED $ECLASS"
15 13
16DEPEND="!bootstrap? ( sys-devel/patch )" 14DEPEND="!bootstrap? ( sys-devel/patch )"
15# sys-apps/shadow is needed for useradd, etc, bug #94745.
17 16
18DESCRIPTION="Based on the ${ECLASS} eclass" 17DESCRIPTION="Based on the ${ECLASS} eclass"
19
20# ecpu_check
21# Usage:
22#
23# ecpu_check array_of_cpu_flags
24#
25# array_of_cpu_flags - An array of cpu flags to check against USE flags
26#
27# Checks user USE related cpu flags against /proc/cpuinfo. If user enables a
28# cpu flag that is not supported in their processor flags, it will warn the
29# user if CROSSCOMPILE is not set to 1 ( because cross compile users are
30# obviously using different cpu flags than their own cpu ). Examples:
31#
32# CPU_FLAGS=(mmx mmx2 sse sse2)
33# ecpu_check CPU_FLAGS
34# Chris White <chriswhite@gentoo.org> (03 Feb 2005)
35
36ecpu_check() {
37 # 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"
211 local PATCH_TARGET="${T}/$$.patch" 173 local PATCH_TARGET="${T}/$$.patch"
212 local PATCH_SUFFIX="" 174 local PATCH_SUFFIX=""
213 local SINGLE_PATCH="no" 175 local SINGLE_PATCH="no"
214 local x="" 176 local x=""
215 177
178 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
179
216 if [ "$#" -gt 1 ] 180 if [ "$#" -gt 1 ]
217 then 181 then
218 local m="" 182 local m=""
219 einfo "${#} patches to apply ..."
220 for m in "$@" ; do 183 for m in "$@" ; do
221 epatch "${m}" 184 epatch "${m}"
222 done 185 done
223 return 0 186 return 0
224 fi 187 fi
278 ;; 241 ;;
279 esac 242 esac
280 243
281 if [ "${SINGLE_PATCH}" = "no" ] 244 if [ "${SINGLE_PATCH}" = "no" ]
282 then 245 then
283 einfo "Applying various patches (bugfixes/updates) ..." 246 einfo "${EPATCH_MULTI_MSG}"
284 fi 247 fi
285 for x in ${EPATCH_SOURCE} 248 for x in ${EPATCH_SOURCE}
286 do 249 do
287 # New ARCH dependant patch naming scheme ... 250 # New ARCH dependant patch naming scheme ...
288 # 251 #
289 # ???_arch_foo.patch 252 # ???_arch_foo.patch
290 # 253 #
291 if [ -f ${x} ] && \ 254 if [ -f ${x} ] && \
292 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "`eval echo \$\{x/_${ARCH}_\}`" != "${x}" ] || \ 255 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "${x/_${ARCH}_}" != "${x}" ] || \
293 [ "${EPATCH_FORCE}" = "yes" ]) 256 [ "${EPATCH_FORCE}" = "yes" ])
294 then 257 then
295 local count=0 258 local count=0
296 local popts="${EPATCH_OPTS}" 259 local popts="${EPATCH_OPTS}"
297 local patchname=${x##*/} 260 local patchname=${x##*/}
386 fi 349 fi
387 350
388 if [ "${count}" -eq 5 ] 351 if [ "${count}" -eq 5 ]
389 then 352 then
390 echo 353 echo
391 eerror "Failed Patch: ${patchname}!" 354 eerror "Failed Patch: ${patchname} !"
355 eerror " ( ${PATCH_TARGET} )"
392 eerror 356 eerror
393 eerror "Include in your bugreport the contents of:" 357 eerror "Include in your bugreport the contents of:"
394 eerror 358 eerror
395 eerror " ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}" 359 eerror " ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}"
396 echo 360 echo
406 then 370 then
407 einfo "Done with patching" 371 einfo "Done with patching"
408 fi 372 fi
409} 373}
410 374
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 if [ ! -r /proc/cpuinfo ]
465 then
466 return 1
467 fi
468
469 # This bit is from H?kan Wessberg <nacka-gentoo@refug.org>, bug #13565.
470 if [ "`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | wc -l`" -gt 0 ]
471 then
472 ADMINOPTS="`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | cut -d= -f2 | sed 's/\"//g'`"
473 ADMINPARAM="`echo ${ADMINOPTS} | gawk '{match($0, /-j *[0-9]*/, opt); print opt[0]}'`"
474 ADMINPARAM="${ADMINPARAM/-j}"
475 fi
476
477 export MAKEOPTS="`echo ${MAKEOPTS} | sed -e 's:-j *[0-9]*::g'`"
478
479 if [ "${ARCH}" = "amd64" -o "${ARCH}" = "x86" -o "${ARCH}" = "hppa" -o \
480 "${ARCH}" = "arm" -o "${ARCH}" = "mips" -o "${ARCH}" = "ia64" ]
481 then
482 # these archs will always have "[Pp]rocessor"
483 jobs="$((`grep -c ^[Pp]rocessor /proc/cpuinfo` * 2))"
484
485 elif [ "${ARCH}" = "sparc" -o "${ARCH}" = "sparc64" ]
486 then
487 # sparc always has "ncpus active"
488 jobs="$((`grep "^ncpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
489
490 elif [ "${ARCH}" = "alpha" ]
491 then
492 # alpha has "cpus active", but only when compiled with SMP
493 if [ "`grep -c "^cpus active" /proc/cpuinfo`" -eq 1 ]
494 then
495 jobs="$((`grep "^cpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
496 else
497 jobs=2
498 fi
499
500 elif [ "${ARCH}" = "ppc" -o "${ARCH}" = "ppc64" ]
501 then
502 # ppc has "processor", but only when compiled with SMP
503 if [ "`grep -c "^processor" /proc/cpuinfo`" -eq 1 ]
504 then
505 jobs="$((`grep -c ^processor /proc/cpuinfo` * 2))"
506 else
507 jobs=2
508 fi
509 elif [ "${ARCH}" = "s390" ]
510 then
511 # s390 has "# processors : "
512 jobs="$((`grep "^\# processors" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
513 else
514 jobs="$((`grep -c ^cpu /proc/cpuinfo` * 2))"
515 die "Unknown ARCH -- ${ARCH}!"
516 fi
517
518 # Make sure the number is valid ...
519 if [ "${jobs}" -lt 1 ]
520 then
521 jobs=1
522 fi
523
524 if [ -n "${ADMINPARAM}" ]
525 then
526 if [ "${jobs}" -gt "${ADMINPARAM}" ]
527 then
528 einfo "Setting make jobs to \"-j${ADMINPARAM}\" to ensure successful merge ..."
529 export MAKEOPTS="${MAKEOPTS} -j${ADMINPARAM}"
530 else
531 einfo "Setting make jobs to \"-j${jobs}\" to ensure successful merge ..."
532 export MAKEOPTS="${MAKEOPTS} -j${jobs}"
533 fi
534 fi
535}
536
537# Cheap replacement for when debianutils (and thus mktemp) 375# Cheap replacement for when debianutils (and thus mktemp)
538# does not exist on the users system 376# does not exist on the users system
539# vapier@gentoo.org 377# vapier@gentoo.org
540# 378#
541# Takes just 1 optional parameter (the directory to create tmpfile in) 379# Takes just 1 optional parameter (the directory to create tmpfile in)
542emktemp() { 380emktemp() {
543 local exe="touch" 381 local exe="touch"
544 [ "$1" == "-d" ] && exe="mkdir" && shift 382 [[ $1 == -d ]] && exe="mkdir" && shift
545 local topdir="$1" 383 local topdir=$1
546 384
547 if [ -z "${topdir}" ] 385 if [[ -z ${topdir} ]] ; then
548 then
549 [ -z "${T}" ] \ 386 [[ -z ${T} ]] \
550 && topdir="/tmp" \ 387 && topdir="/tmp" \
551 || topdir="${T}" 388 || topdir=${T}
552 fi 389 fi
553 390
554 if [ -z "$(type -p mktemp)" ] 391 if [[ -z $(type -p mktemp) ]] ; then
555 then
556 local tmp=/ 392 local tmp=/
557 while [ -e "${tmp}" ] ; do 393 while [[ -e ${tmp} ]] ; do
558 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 394 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
559 done 395 done
560 ${exe} "${tmp}" 396 ${exe} "${tmp}" || ${exe} -p "${tmp}"
561 echo "${tmp}" 397 echo "${tmp}"
562 else 398 else
563 [ "${exe}" == "touch" ] \ 399 [[ ${exe} == "touch" ]] \
564 && exe="-p" \ 400 && exe="-p" \
565 || exe="-d" 401 || exe="-d"
566 mktemp ${exe} "${topdir}" 402 mktemp ${exe} "${topdir}"
567 fi 403 fi
568} 404}
572# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 408# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
573# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 409# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
574# 410#
575# egetent(database, key) 411# egetent(database, key)
576egetent() { 412egetent() {
577 if useq ppc-macos ; then 413 if [[ "${USERLAND}" == "Darwin" ]] ; then
578 case "$2" in 414 case "$2" in
579 *[!0-9]*) # Non numeric 415 *[!0-9]*) # Non numeric
580 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 416 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
581 ;; 417 ;;
582 *) # Numeric 418 *) # Numeric
583 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 419 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
584 ;; 420 ;;
585 esac 421 esac
586 elif useq x86-fbsd ; then 422 elif [[ "${USERLAND}" == "BSD" ]] ; then
587 local action 423 local action
588 if [ "$1" == "passwd" ] 424 if [ "$1" == "passwd" ]
589 then 425 then
590 action="user" 426 action="user"
591 else 427 else
611# homedir: /dev/null 447# homedir: /dev/null
612# groups: none 448# groups: none
613# extra: comment of 'added by portage for ${PN}' 449# extra: comment of 'added by portage for ${PN}'
614enewuser() { 450enewuser() {
615 # get the username 451 # get the username
616 local euser="$1"; shift 452 local euser=$1; shift
617 if [ -z "${euser}" ] 453 if [[ -z ${euser} ]] ; then
618 then
619 eerror "No username specified !" 454 eerror "No username specified !"
620 die "Cannot call enewuser without a username" 455 die "Cannot call enewuser without a username"
621 fi 456 fi
622 457
623 # lets see if the username already exists 458 # lets see if the username already exists
624 if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ] 459 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then
625 then
626 return 0 460 return 0
627 fi 461 fi
628 einfo "Adding user '${euser}' to your system ..." 462 einfo "Adding user '${euser}' to your system ..."
629 463
630 # options to pass to useradd 464 # options to pass to useradd
631 local opts= 465 local opts=
632 466
633 # handle uid 467 # handle uid
634 local euid="$1"; shift 468 local euid=$1; shift
635 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] 469 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then
636 then
637 if [ "${euid}" -gt 0 ] 470 if [[ ${euid} -gt 0 ]] ; then
638 then
639 if [ ! -z "`egetent passwd ${euid}`" ] 471 if [[ ! -z $(egetent passwd ${euid}) ]] ; then
640 then
641 euid="next" 472 euid="next"
642 fi 473 fi
643 else 474 else
644 eerror "Userid given but is not greater than 0 !" 475 eerror "Userid given but is not greater than 0 !"
645 die "${euid} is not a valid UID" 476 die "${euid} is not a valid UID"
646 fi 477 fi
647 else 478 else
648 euid="next" 479 euid="next"
649 fi 480 fi
650 if [ "${euid}" == "next" ] 481 if [[ ${euid} == "next" ]] ; then
651 then 482 for euid in $(seq 101 999) ; do
652 local pwrange
653 if [ "${USERLAND}" == "BSD" ] ; then
654 pwrange="`jot 898 101`"
655 else
656 pwrange="`seq 101 999`"
657 fi
658 for euid in ${pwrange} ; do
659 [ -z "`egetent passwd ${euid}`" ] && break 483 [[ -z $(egetent passwd ${euid}) ]] && break
660 done 484 done
661 fi 485 fi
662 opts="${opts} -u ${euid}" 486 opts="${opts} -u ${euid}"
663 einfo " - Userid: ${euid}" 487 einfo " - Userid: ${euid}"
664 488
665 # handle shell 489 # handle shell
666 local eshell="$1"; shift 490 local eshell=$1; shift
667 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ] 491 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
668 then
669 if [ ! -e "${eshell}" ] 492 if [[ ! -e ${eshell} ]] ; then
670 then
671 eerror "A shell was specified but it does not exist !" 493 eerror "A shell was specified but it does not exist !"
672 die "${eshell} does not exist" 494 die "${eshell} does not exist"
673 fi 495 fi
674 else 496 else
675 if [ "${USERLAND}" == "BSD" ] 497 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null; do
676 then 498 [[ -x ${ROOT}${shell} ]] && break;
677 eshell="/usr/bin/false" 499 done
678 else 500
679 eshell="/bin/false" 501 if [[ ${shell} == "/dev/null" ]]; then
502 eerror "Unable to identify the shell to use"
503 die "Unable to identify the shell to use"
680 fi 504 fi
505
506 eshell=${shell}
681 fi 507 fi
682 einfo " - Shell: ${eshell}" 508 einfo " - Shell: ${eshell}"
683 opts="${opts} -s ${eshell}" 509 opts="${opts} -s ${eshell}"
684 510
685 # handle homedir 511 # handle homedir
686 local ehome="$1"; shift 512 local ehome=$1; shift
687 if [ -z "${ehome}" ] && [ "${eshell}" != "-1" ] 513 if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then
688 then
689 ehome="/dev/null" 514 ehome="/dev/null"
690 fi 515 fi
691 einfo " - Home: ${ehome}" 516 einfo " - Home: ${ehome}"
692 opts="${opts} -d ${ehome}" 517 opts="${opts} -d ${ehome}"
693 518
694 # handle groups 519 # handle groups
695 local egroups="$1"; shift 520 local egroups=$1; shift
696 if [ ! -z "${egroups}" ] 521 if [[ ! -z ${egroups} ]] ; then
697 then
698 local oldifs="${IFS}" 522 local oldifs=${IFS}
699 local defgroup="" exgroups="" 523 local defgroup="" exgroups=""
700 524
701 export IFS="," 525 export IFS=","
702 for g in ${egroups} 526 for g in ${egroups} ; do
703 do
704 export IFS="${oldifs}" 527 export IFS=${oldifs}
705 if [ -z "`egetent group \"${g}\"`" ] 528 if [[ -z $(egetent group "${g}") ]] ; then
706 then
707 eerror "You must add group ${g} to the system first" 529 eerror "You must add group ${g} to the system first"
708 die "${g} is not a valid GID" 530 die "${g} is not a valid GID"
709 fi 531 fi
710 if [ -z "${defgroup}" ] 532 if [[ -z ${defgroup} ]] ; then
711 then
712 defgroup="${g}" 533 defgroup=${g}
713 else 534 else
714 exgroups="${exgroups},${g}" 535 exgroups="${exgroups},${g}"
715 fi 536 fi
716 export IFS="," 537 export IFS=","
717 done 538 done
718 export IFS="${oldifs}" 539 export IFS=${oldifs}
719 540
720 opts="${opts} -g ${defgroup}" 541 opts="${opts} -g ${defgroup}"
721 if [ ! -z "${exgroups}" ] 542 if [[ ! -z ${exgroups} ]] ; then
722 then
723 opts="${opts} -G ${exgroups:1}" 543 opts="${opts} -G ${exgroups:1}"
724 fi 544 fi
725 else 545 else
726 egroups="(none)" 546 egroups="(none)"
727 fi 547 fi
728 einfo " - Groups: ${egroups}" 548 einfo " - Groups: ${egroups}"
729 549
730 # handle extra and add the user 550 # handle extra and add the user
731 local eextra="$@"
732 local oldsandbox="${SANDBOX_ON}" 551 local oldsandbox=${SANDBOX_ON}
733 export SANDBOX_ON="0" 552 export SANDBOX_ON="0"
734 if useq ppc-macos 553 case ${USERLAND} in
735 then 554 Darwin)
736 ### Make the user 555 ### Make the user
737 if [ -z "${eextra}" ] 556 if [[ -z $@ ]] ; then
738 then
739 dscl . create /users/${euser} uid ${euid} 557 dscl . create /users/${euser} uid ${euid}
740 dscl . create /users/${euser} shell ${eshell} 558 dscl . create /users/${euser} shell ${eshell}
741 dscl . create /users/${euser} home ${ehome} 559 dscl . create /users/${euser} home ${ehome}
742 dscl . create /users/${euser} realname "added by portage for ${PN}" 560 dscl . create /users/${euser} realname "added by portage for ${PN}"
743 ### Add the user to the groups specified 561 ### Add the user to the groups specified
744 local oldifs="${IFS}" 562 local oldifs=${IFS}
745 export IFS="," 563 export IFS=","
746 for g in ${egroups} 564 for g in ${egroups} ; do
747 do
748 dscl . merge /groups/${g} users ${euser} 565 dscl . merge /groups/${g} users ${euser}
749 done 566 done
750 export IFS="${oldifs}" 567 export IFS=${oldifs}
751 else 568 else
752 einfo "Extra options are not supported on macos yet" 569 einfo "Extra options are not supported on Darwin yet"
753 einfo "Please report the ebuild along with the info below" 570 einfo "Please report the ebuild along with the info below"
754 einfo "eextra: ${eextra}" 571 einfo "eextra: $@"
755 die "Required function missing" 572 die "Required function missing"
756 fi 573 fi
757 elif use x86-fbsd ; then 574 ;;
758 if [ -z "${eextra}" ] 575 BSD)
759 then 576 if [[ -z $@ ]] ; then
760 pw useradd ${euser} ${opts} \ 577 pw useradd ${euser} ${opts} \
761 -c "added by portage for ${PN}" \ 578 -c "added by portage for ${PN}" \
762 die "enewuser failed" 579 die "enewuser failed"
763 else 580 else
764 einfo " - Extra: ${eextra}" 581 einfo " - Extra: $@"
765 pw useradd ${euser} ${opts} \ 582 pw useradd ${euser} ${opts} \
766 -c ${eextra} || die "enewuser failed" 583 "$@" || die "enewuser failed"
767 fi 584 fi
768 else 585 ;;
769 if [ -z "${eextra}" ] 586 *)
770 then 587 if [[ -z $@ ]] ; then
771 useradd ${opts} ${euser} \ 588 useradd ${opts} ${euser} \
772 -c "added by portage for ${PN}" \ 589 -c "added by portage for ${PN}" \
773 || die "enewuser failed" 590 || die "enewuser failed"
774 else 591 else
775 einfo " - Extra: ${eextra}" 592 einfo " - Extra: $@"
776 useradd ${opts} ${euser} ${eextra} \ 593 useradd ${opts} ${euser} "$@" \
777 || die "enewuser failed" 594 || die "enewuser failed"
778 fi 595 fi
596 ;;
597 esac
598
599 if [[ ! -e ${ROOT}/${ehome} ]] ; then
600 einfo " - Creating ${ehome} in ${ROOT}"
601 mkdir -p "${ROOT}/${ehome}"
602 chown ${euser} "${ROOT}/${ehome}"
603 chmod 755 "${ROOT}/${ehome}"
779 fi 604 fi
605
780 export SANDBOX_ON="${oldsandbox}" 606 export SANDBOX_ON=${oldsandbox}
781
782 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ]
783 then
784 einfo " - Creating ${ehome} in ${D}"
785 dodir ${ehome}
786 fowners ${euser} ${ehome}
787 fperms 755 ${ehome}
788 fi
789} 607}
790 608
791# Simplify/standardize adding groups to the system 609# Simplify/standardize adding groups to the system
792# vapier@gentoo.org 610# vapier@gentoo.org
793# 611#
822 then 640 then
823 if [ "${egid}" -gt 0 ] 641 if [ "${egid}" -gt 0 ]
824 then 642 then
825 if [ -z "`egetent group ${egid}`" ] 643 if [ -z "`egetent group ${egid}`" ]
826 then 644 then
827 if useq ppc-macos ; then 645 if [[ "${USERLAND}" == "Darwin" ]]; then
828 opts="${opts} ${egid}" 646 opts="${opts} ${egid}"
829 else 647 else
830 opts="${opts} -g ${egid}" 648 opts="${opts} -g ${egid}"
831 fi 649 fi
832 else 650 else
846 opts="${opts} ${eextra}" 664 opts="${opts} ${eextra}"
847 665
848 # add the group 666 # add the group
849 local oldsandbox="${SANDBOX_ON}" 667 local oldsandbox="${SANDBOX_ON}"
850 export SANDBOX_ON="0" 668 export SANDBOX_ON="0"
851 if useq ppc-macos ; then 669 if [[ "${USERLAND}" == "Darwin" ]]; then
852 if [ ! -z "${eextra}" ]; 670 if [ ! -z "${eextra}" ];
853 then 671 then
854 einfo "Extra options are not supported on macos yet" 672 einfo "Extra options are not supported on Darwin/OS X yet"
855 einfo "Please report the ebuild along with the info below" 673 einfo "Please report the ebuild along with the info below"
856 einfo "eextra: ${eextra}" 674 einfo "eextra: ${eextra}"
857 die "Required function missing" 675 die "Required function missing"
858 fi 676 fi
859 677
860 # If we need the next available 678 # If we need the next available
861 case ${egid} in 679 case ${egid} in
862 *[!0-9]*) # Non numeric 680 *[!0-9]*) # Non numeric
863 for egid in `jot 898 101`; do 681 for egid in $(seq 101 999); do
864 [ -z "`egetent group ${egid}`" ] && break 682 [ -z "`egetent group ${egid}`" ] && break
865 done 683 done
866 esac 684 esac
867 dscl . create /groups/${egroup} gid ${egid} 685 dscl . create /groups/${egroup} gid ${egid}
868 dscl . create /groups/${egroup} passwd '*' 686 dscl . create /groups/${egroup} passwd '*'
869 elif use x86-fbsd ; then 687 elif [[ "${USERLAND}" == "BSD" ]] ; then
870 case ${egid} in 688 case ${egid} in
871 *[!0-9]*) # Non numeric 689 *[!0-9]*) # Non numeric
872 for egid in `jot 898 101`; do 690 for egid in $(seq 101 999); do
873 [ -z "`egetent group ${egid}`" ] && break 691 [ -z "`egetent group ${egid}`" ] && break
874 done 692 done
875 esac 693 esac
876 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 694 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
877 else 695 else
909# name: the name that will show up in the menu 727# name: the name that will show up in the menu
910# icon: give your little like a pretty little icon ... 728# icon: give your little like a pretty little icon ...
911# this can be relative (to /usr/share/pixmaps) or 729# this can be relative (to /usr/share/pixmaps) or
912# a full path to an icon 730# a full path to an icon
913# type: what kind of application is this ? for categories: 731# type: what kind of application is this ? for categories:
914# http://www.freedesktop.org/wiki/Standards_2fmenu_2dspec 732# http://www.freedesktop.org/Standards/desktop-entry-spec
915# path: if your app needs to startup in a specific dir 733# path: if your app needs to startup in a specific dir
916make_desktop_entry() { 734make_desktop_entry() {
917 [ -z "$1" ] && eerror "make_desktop_entry: You must specify the executable" && return 1 735 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
918 736
919 local exec="${1}" 737 local exec=${1}
920 local name="${2:-${PN}}" 738 local name=${2:-${PN}}
921 local icon="${3:-${PN}.png}" 739 local icon=${3:-${PN}.png}
922 local type="${4}" 740 local type=${4}
923 local subdir="${6}" 741 local path=${5}
924 local path="${5:-${GAMES_BINDIR}}" 742
925 if [ -z "${type}" ] 743 if [[ -z ${type} ]] ; then
926 then 744 local catmaj=${CATEGORY%%-*}
927 case ${CATEGORY} in 745 local catmin=${CATEGORY##*-}
928 "app-emulation") 746 case ${catmaj} in
929 type=Emulator 747 app)
930 subdir="Emulation" 748 case ${catmin} in
749 admin) type=System;;
750 cdr) type=DiscBurning;;
751 dicts) type=Dictionary;;
752 editors) type=TextEditor;;
753 emacs) type=TextEditor;;
754 emulation) type=Emulator;;
755 laptop) type=HardwareSettings;;
756 office) type=Office;;
757 vim) type=TextEditor;;
758 xemacs) type=TextEditor;;
759 *) type=;;
760 esac
931 ;; 761 ;;
932 "games-"*) 762
933 type=Game 763 dev)
934 subdir="Games" 764 type="Development"
935 ;; 765 ;;
936 "net-"*) 766
937 type=Network 767 games)
938 subdir="${type}" 768 case ${catmin} in
769 action) type=ActionGame;;
770 arcade) type=ArcadeGame;;
771 board) type=BoardGame;;
772 kid) type=KidsGame;;
773 emulation) type=Emulator;;
774 puzzle) type=LogicGame;;
775 rpg) type=RolePlaying;;
776 roguelike) type=RolePlaying;;
777 simulation) type=Simulation;;
778 sports) type=SportsGame;;
779 strategy) type=StrategyGame;;
780 *) type=;;
781 esac
782 type="Game;${type}"
939 ;; 783 ;;
784
785 mail)
786 type="Network;Email"
787 ;;
788
789 media)
790 case ${catmin} in
791 gfx) type=Graphics;;
792 radio) type=Tuner;;
793 sound) type=Audio;;
794 tv) type=TV;;
795 video) type=Video;;
796 *) type=;;
797 esac
798 type="AudioVideo;${type}"
799 ;;
800
801 net)
802 case ${catmin} in
803 dialup) type=Dialup;;
804 ftp) type=FileTransfer;;
805 im) type=InstantMessaging;;
806 irc) type=IRCClient;;
807 mail) type=Email;;
808 news) type=News;;
809 nntp) type=News;;
810 p2p) type=FileTransfer;;
811 *) type=;;
812 esac
813 type="Network;${type}"
814 ;;
815
816 sci)
817 case ${catmin} in
818 astro*) type=Astronomoy;;
819 bio*) type=Biology;;
820 calc*) type=Calculator;;
821 chem*) type=Chemistry;;
822 geo*) type=Geology;;
823 math*) type=Math;;
824 *) type=;;
825 esac
826 type="Science;${type}"
827 ;;
828
829 www)
830 case ${catmin} in
831 client) type=WebBrowser;;
832 *) type=;;
833 esac
834 type="Network"
835 ;;
836
940 *) 837 *)
941 type= 838 type=
942 subdir=
943 ;; 839 ;;
944 esac 840 esac
945 fi 841 fi
842 if [ "${SLOT}" == "0" ] ; then
843 local desktop_name="${PN}"
844 else
845 local desktop_name="${PN}-${SLOT}"
846 fi
946 local desktop="${T}/${exec%% *}-${P}.desktop" 847 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
947 848
948echo "[Desktop Entry] 849echo "[Desktop Entry]
949Encoding=UTF-8 850Encoding=UTF-8
950Version=0.9.2 851Version=0.9.2
951Name=${name} 852Name=${name}
967# make_desktop_entry(<title>, <command>) 868# make_desktop_entry(<title>, <command>)
968# title: File to execute to start the Window Manager 869# title: File to execute to start the Window Manager
969# command: Name of the Window Manager 870# command: Name of the Window Manager
970 871
971make_session_desktop() { 872make_session_desktop() {
972
973 [ -z "$1" ] && eerror "make_session_desktop: You must specify the title" && return 1 873 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1
974 [ -z "$2" ] && eerror "make_session_desktop: You must specify the command" && return 1 874 [[ -z $2 ]] && eerror "make_session_desktop: You must specify the command" && return 1
975 875
976 local title="${1}" 876 local title=$1
977 local command="${2}" 877 local command=$2
978 local desktop="${T}/${wm}.desktop" 878 local desktop=${T}/${wm}.desktop
979 879
980echo "[Desktop Entry] 880echo "[Desktop Entry]
981Encoding=UTF-8 881Encoding=UTF-8
982Name=${title} 882Name=${title}
983Comment=This session logs you into ${title} 883Comment=This session logs you into ${title}
985TryExec=${command} 885TryExec=${command}
986Type=Application" > "${desktop}" 886Type=Application" > "${desktop}"
987 887
988 insinto /usr/share/xsessions 888 insinto /usr/share/xsessions
989 doins "${desktop}" 889 doins "${desktop}"
990
991 return 0
992} 890}
993 891
994domenu() { 892domenu() {
995 local i 893 local i j
996 local j
997 insinto /usr/share/applications 894 insinto /usr/share/applications
998 for i in ${@} 895 for i in "$@" ; do
999 do
1000 if [ -f "${i}" ]; 896 if [[ -f ${i} ]] ; then
1001 then
1002 doins ${i} 897 doins "${i}"
1003 elif [ -d "${i}" ]; 898 elif [[ -d ${i} ]] ; then
1004 then
1005 for j in ${i}/*.desktop 899 for j in "${i}"/*.desktop ; do
1006 do
1007 doins ${j} 900 doins "${j}"
1008 done 901 done
1009 fi 902 fi
1010 done 903 done
1011} 904}
905newmenu() {
906 insinto /usr/share/applications
907 newins "$1" "$2"
908}
1012 909
1013doicon() { 910doicon() {
1014 local i 911 local i j
1015 local j
1016 insinto /usr/share/pixmaps 912 insinto /usr/share/pixmaps
1017 for i in ${@} 913 for i in "$@" ; do
1018 do
1019 if [ -f "${i}" ]; 914 if [[ -f ${i} ]] ; then
1020 then
1021 doins ${i} 915 doins "${i}"
1022 elif [ -d "${i}" ]; 916 elif [[ -d ${i} ]] ; then
1023 then
1024 for j in ${i}/*.png 917 for j in "${i}"/*.png ; do
1025 do
1026 doins ${j} 918 doins "${j}"
1027 done 919 done
1028 fi 920 fi
1029 done 921 done
922}
923newicon() {
924 insinto /usr/share/pixmaps
925 newins "$1" "$2"
1030} 926}
1031 927
1032############################################################## 928##############################################################
1033# END: Handle .desktop files and menu entries # 929# END: Handle .desktop files and menu entries #
1034############################################################## 930##############################################################
1035 931
1036 932
1037# for internal use only (unpack_pdv and unpack_makeself) 933# for internal use only (unpack_pdv and unpack_makeself)
1038find_unpackable_file() { 934find_unpackable_file() {
1039 local src="$1" 935 local src=$1
1040 if [ -z "${src}" ] 936 if [[ -z ${src} ]] ; then
1041 then
1042 src="${DISTDIR}/${A}" 937 src=${DISTDIR}/${A}
1043 else 938 else
1044 if [ -e "${DISTDIR}/${src}" ] 939 if [[ -e ${DISTDIR}/${src} ]] ; then
1045 then
1046 src="${DISTDIR}/${src}" 940 src=${DISTDIR}/${src}
1047 elif [ -e "${PWD}/${src}" ] 941 elif [[ -e ${PWD}/${src} ]] ; then
1048 then
1049 src="${PWD}/${src}" 942 src=${PWD}/${src}
1050 elif [ -e "${src}" ] 943 elif [[ -e ${src} ]] ; then
1051 then
1052 src="${src}" 944 src=${src}
1053 fi
1054 fi 945 fi
1055 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 946 fi
947 [[ ! -e ${src} ]] && return 1
1056 echo "${src}" 948 echo "${src}"
1057} 949}
1058 950
1059# Unpack those pesky pdv generated files ... 951# Unpack those pesky pdv generated files ...
1060# They're self-unpacking programs with the binary package stuffed in 952# They're self-unpacking programs with the binary package stuffed in
1075# lseek 967# lseek
1076# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 968# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
1077# lseek(3, -4, SEEK_END) = 2981250 969# lseek(3, -4, SEEK_END) = 2981250
1078# thus we would pass in the value of '4' as the second parameter. 970# thus we would pass in the value of '4' as the second parameter.
1079unpack_pdv() { 971unpack_pdv() {
1080 local src="`find_unpackable_file $1`" 972 local src=$(find_unpackable_file $1)
1081 local sizeoff_t="$2" 973 local sizeoff_t=$2
1082 974
975 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1083 [ -z "${sizeoff_t}" ] && die "No idea what off_t size was used for this pdv :(" 976 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
1084 977
1085 local shrtsrc="`basename ${src}`" 978 local shrtsrc="`basename ${src}`"
1086 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 979 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1087 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 980 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
1088 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"` 981 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
1154# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1047# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1155# - If the file is not specified then unpack will utilize ${A}. 1048# - If the file is not specified then unpack will utilize ${A}.
1156# - If the offset is not specified then we will attempt to extract 1049# - If the offset is not specified then we will attempt to extract
1157# the proper offset from the script itself. 1050# the proper offset from the script itself.
1158unpack_makeself() { 1051unpack_makeself() {
1159 local src="$(find_unpackable_file "$1")" 1052 local src=$(find_unpackable_file "$1")
1160 local skip="$2" 1053 local skip=$2
1161 local exe="$3" 1054 local exe=$3
1162 1055
1056 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1057
1163 local shrtsrc="$(basename "${src}")" 1058 local shrtsrc=$(basename "${src}")
1164 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1059 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1165 if [ -z "${skip}" ] 1060 if [ -z "${skip}" ]
1166 then 1061 then
1167 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1062 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`"
1168 local skip=0 1063 local skip=0
1239check_license() { 1134check_license() {
1240 local lic=$1 1135 local lic=$1
1241 if [ -z "${lic}" ] ; then 1136 if [ -z "${lic}" ] ; then
1242 lic="${PORTDIR}/licenses/${LICENSE}" 1137 lic="${PORTDIR}/licenses/${LICENSE}"
1243 else 1138 else
1244 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1139 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1245 lic="${PORTDIR}/licenses/${src}" 1140 lic="${PORTDIR}/licenses/${lic}"
1246 elif [ -e "${PWD}/${src}" ] ; then 1141 elif [ -e "${PWD}/${lic}" ] ; then
1247 lic="${PWD}/${src}" 1142 lic="${PWD}/${lic}"
1248 elif [ -e "${src}" ] ; then 1143 elif [ -e "${lic}" ] ; then
1249 lic="${src}" 1144 lic="${lic}"
1250 fi 1145 fi
1251 fi 1146 fi
1252 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1147 [ ! -f "${lic}" ] && die "Could not find requested license ${src}"
1253 local l="`basename ${lic}`" 1148 local l="`basename ${lic}`"
1254 1149
1428# displayed and we'll hang out here until: 1323# displayed and we'll hang out here until:
1429# (1) the file is found on a mounted cdrom 1324# (1) the file is found on a mounted cdrom
1430# (2) the user hits CTRL+C 1325# (2) the user hits CTRL+C
1431cdrom_locate_file_on_cd() { 1326cdrom_locate_file_on_cd() {
1432 while [[ -z ${CDROM_ROOT} ]] ; do 1327 while [[ -z ${CDROM_ROOT} ]] ; do
1433 local dir="$(dirname ${@})" 1328 local dir=$(dirname "$*")
1434 local file="$(basename ${@})" 1329 local file=$(basename "$*")
1435 local mline="" 1330 local mline=""
1436 local showedmsg=0 1331 local showedmsg=0
1437 1332
1438 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1333 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do
1439 [[ -d ${mline}/${dir} ]] || continue 1334 [[ -d ${mline}/${dir} ]] || continue
1440 [[ ! -z $(find ${mline}/${dir} -iname ${file} -maxdepth 1) ]] \ 1335 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \
1441 && export CDROM_ROOT=${mline} 1336 && export CDROM_ROOT=${mline}
1442 done 1337 done
1443 1338
1444 if [[ -z ${CDROM_ROOT} ]] ; then 1339 if [[ -z ${CDROM_ROOT} ]] ; then
1445 echo 1340 echo
1460 fi 1355 fi
1461 showedmsg=1 1356 showedmsg=1
1462 fi 1357 fi
1463 einfo "Press return to scan for the cd again" 1358 einfo "Press return to scan for the cd again"
1464 einfo "or hit CTRL+C to abort the emerge." 1359 einfo "or hit CTRL+C to abort the emerge."
1360 echo
1361 einfo "If you are having trouble with the detection"
1362 einfo "of your CD, it is possible that you do not have"
1363 einfo "Joliet support enabled in your kernel. Please"
1364 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1465 read 1365 read
1466 fi 1366 fi
1467 done 1367 done
1468} 1368}
1469 1369
1513 else 1413 else
1514 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1414 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA"
1515 fi 1415 fi
1516 done 1416 done
1517 if [[ -z ${newls} ]] ; then 1417 if [[ -z ${newls} ]] ; then
1518 unset LINGUAS 1418 export LINGUAS=""
1519 else 1419 else
1520 export LINGUAS=${newls:1} 1420 export LINGUAS=${newls:1}
1521 fi 1421 fi
1522} 1422}
1523 1423
1533 while ((i--)) ; do 1433 while ((i--)) ; do
1534 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass" 1434 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1535 done 1435 done
1536 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1436 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1537 case ${ARCH} in 1437 case ${ARCH} in
1538 x86) export ARCH="i386";; 1438 x86) export ARCH="i386";;
1539 amd64) export ARCH="x86_64";; 1439 amd64) export ARCH="x86_64";;
1540 hppa) export ARCH="parisc";; 1440 hppa) export ARCH="parisc";;
1541 mips) export ARCH="mips";; 1441 mips) export ARCH="mips";;
1542 sparc) export ARCH="$(tc-arch-kernel)";; # Yeah this is ugly, but it's even WORSE if you don't do this. linux-info.eclass's set_arch_to_kernel is fixed, but won't get used over this one! 1442 sparc) export ARCH="$(tc-arch-kernel)";; # Yeah this is ugly, but it's even WORSE if you don't do this. linux-info.eclass's set_arch_to_kernel is fixed, but won't get used over this one!
1543 *) export ARCH="${ARCH}";; 1443 *) export ARCH="${ARCH}";;
1544 esac 1444 esac
1545} 1445}
1546 1446
1547# set's ARCH back to what portage expects 1447# set's ARCH back to what portage expects
1548set_arch_to_portage() { 1448set_arch_to_portage() {
1592 LIB=$1 1492 LIB=$1
1593 1493
1594 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1494 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1595 SONAME=`basename ${LIB}` 1495 SONAME=`basename ${LIB}`
1596 1496
1597 einfo "An old version of an installed library was detected on your system." 1497 ewarn "An old version of an installed library was detected on your system."
1598 einfo "In order to avoid breaking packages that link against is, this older version" 1498 ewarn "In order to avoid breaking packages that link against it, this older version"
1599 einfo "is not being removed. In order to make full use of this newer version," 1499 ewarn "is not being removed. In order to make full use of this newer version,"
1600 einfo "you will need to execute the following command:" 1500 ewarn "you will need to execute the following command:"
1601 einfo " revdep-rebuild --soname ${SONAME}" 1501 ewarn " revdep-rebuild --soname ${SONAME}"
1602 einfo 1502 ewarn
1603 einfo "After doing that, you can safely remove ${LIB}" 1503 ewarn "After doing that, you can safely remove ${LIB}"
1604 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1504 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1605 fi 1505 fi
1606} 1506}
1607 1507
1608# Hack for people to figure out if a package was built with 1508# Hack for people to figure out if a package was built with
1609# certain USE flags 1509# certain USE flags
1655dopamd() { 1555dopamd() {
1656 [[ -z $1 ]] && die "dopamd requires at least one argument" 1556 [[ -z $1 ]] && die "dopamd requires at least one argument"
1657 1557
1658 use pam || return 0 1558 use pam || return 0
1659 1559
1660 insinto /etc/pam.d 1560 INSDESTTREE=/etc/pam.d \
1661 # these are the default doins options, but be explicit just in case
1662 insopts -m 0644 -o root -g root
1663 doins "$@" || die "failed to install $@" 1561 doins "$@" || die "failed to install $@"
1664} 1562}
1665# newpamd <old name> <new name> 1563# newpamd <old name> <new name>
1666# 1564#
1667# Install pam file <old name> as <new name> in /etc/pam.d 1565# Install pam file <old name> as <new name> in /etc/pam.d
1668newpamd() { 1566newpamd() {
1669 [[ $# -ne 2 ]] && die "newpamd requires two arguements" 1567 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1670 1568
1671 use pam || return 0 1569 use pam || return 0
1672 1570
1673 insinto /etc/pam.d 1571 INSDESTTREE=/etc/pam.d \
1674 # these are the default doins options, but be explicit just in case
1675 insopts -m 0644 -o root -g root
1676 newins "$1" "$2" || die "failed to install $1 as $2" 1572 newins "$1" "$2" || die "failed to install $1 as $2"
1677} 1573}
1574
1575# make a wrapper script ...
1576# NOTE: this was originally games_make_wrapper, but I noticed other places where
1577# this could be used, so I have moved it here and made it not games-specific
1578# -- wolf31o2
1579# $1 == wrapper name
1580# $2 == binary to run
1581# $3 == directory to chdir before running binary
1582# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1583# $5 == path for wrapper
1584make_wrapper() {
1585 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1586 local tmpwrapper=$(emktemp)
1587 cat << EOF > "${tmpwrapper}"
1588#!/bin/sh
1589cd "${chdir}"
1590export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1591exec ${bin} "\$@"
1592EOF
1593 chmod go+rx "${tmpwrapper}"
1594 if [ -n "${5}" ]
1595 then
1596 exeinto ${5}
1597 newexe "${tmpwrapper}" "${wrapper}"
1598 else
1599 newbin "${tmpwrapper}" "${wrapper}"
1600 fi
1601}

Legend:
Removed from v.1.157  
changed lines
  Added in v.1.199

  ViewVC Help
Powered by ViewVC 1.1.20