/[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.200
1# Copyright 1999-2004 Gentoo Foundation 1# Copyright 1999-2005 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.152 2005/02/18 18:04:42 azarah Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.200 2005/09/23 20:44:26 wolf31o2 Exp $
4# 4#
5# Author: Martin Schlemmer <azarah@gentoo.org> 5# Author: Martin Schlemmer <azarah@gentoo.org>
6# 6#
7# This eclass is for general purpose functions that most ebuilds 7# This eclass is for general purpose functions that most ebuilds
8# have to implement themselves. 8# have to implement themselves.
9# 9#
10# NB: If you add anything, please comment it! 10# NB: If you add anything, please comment it!
11 11
12inherit multilib 12inherit multilib portability
13ECLASS=eutils
14INHERITED="$INHERITED $ECLASS"
15 13
16DEPEND="!bootstrap? ( sys-devel/patch )" 14DEPEND="!bootstrap? ( sys-devel/patch )"
15# sys-apps/shadow is needed for useradd, etc, bug #94745.
17 16
18DESCRIPTION="Based on the ${ECLASS} eclass" 17DESCRIPTION="Based on the ${ECLASS} eclass"
19
20# ecpu_check
21# Usage:
22#
23# ecpu_check array_of_cpu_flags
24#
25# array_of_cpu_flags - An array of cpu flags to check against USE flags
26#
27# Checks user USE related cpu flags against /proc/cpuinfo. If user enables a
28# cpu flag that is not supported in their processor flags, it will warn the
29# user if CROSSCOMPILE is not set to 1 ( because cross compile users are
30# obviously using different cpu flags than their own cpu ). Examples:
31#
32# CPU_FLAGS=(mmx mmx2 sse sse2)
33# ecpu_check CPU_FLAGS
34# Chris White <chriswhite@gentoo.org> (03 Feb 2005)
35
36ecpu_check() {
37 # 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 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) 375# Cheap replacement for when debianutils (and thus mktemp)
540# does not exist on the users system 376# does not exist on the users system
541# vapier@gentoo.org 377# vapier@gentoo.org
542# 378#
543# Takes just 1 optional parameter (the directory to create tmpfile in) 379# Takes just 1 optional parameter (the directory to create tmpfile in)
544emktemp() { 380emktemp() {
545 local exe="touch" 381 local exe="touch"
546 [ "$1" == "-d" ] && exe="mkdir" && shift 382 [[ $1 == -d ]] && exe="mkdir" && shift
547 local topdir="$1" 383 local topdir=$1
548 384
549 if [ -z "${topdir}" ] 385 if [[ -z ${topdir} ]] ; then
550 then
551 [ -z "${T}" ] \ 386 [[ -z ${T} ]] \
552 && topdir="/tmp" \ 387 && topdir="/tmp" \
553 || topdir="${T}" 388 || topdir=${T}
554 fi 389 fi
555 390
556 if [ -z "$(type -p mktemp)" ] 391 if [[ -z $(type -p mktemp) ]] ; then
557 then
558 local tmp=/ 392 local tmp=/
559 while [ -e "${tmp}" ] ; do 393 while [[ -e ${tmp} ]] ; do
560 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 394 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
561 done 395 done
562 ${exe} "${tmp}" 396 ${exe} "${tmp}" || ${exe} -p "${tmp}"
563 echo "${tmp}" 397 echo "${tmp}"
564 else 398 else
565 [ "${exe}" == "touch" ] \ 399 [[ ${exe} == "touch" ]] \
566 && exe="-p" \ 400 && exe="-p" \
567 || exe="-d" 401 || exe="-d"
568 mktemp ${exe} "${topdir}" 402 mktemp ${exe} "${topdir}"
569 fi 403 fi
570} 404}
574# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 408# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
575# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 409# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
576# 410#
577# egetent(database, key) 411# egetent(database, key)
578egetent() { 412egetent() {
579 if useq ppc-macos ; then 413 if [[ "${USERLAND}" == "Darwin" ]] ; then
580 case "$2" in 414 case "$2" in
581 *[!0-9]*) # Non numeric 415 *[!0-9]*) # Non numeric
582 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 416 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
583 ;; 417 ;;
584 *) # Numeric 418 *) # Numeric
585 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 419 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
586 ;; 420 ;;
587 esac 421 esac
588 elif useq x86-fbsd ; then 422 elif [[ "${USERLAND}" == "BSD" ]] ; then
589 local action 423 local action
590 if [ "$1" == "passwd" ] 424 if [ "$1" == "passwd" ]
591 then 425 then
592 action="user" 426 action="user"
593 else 427 else
613# homedir: /dev/null 447# homedir: /dev/null
614# groups: none 448# groups: none
615# extra: comment of 'added by portage for ${PN}' 449# extra: comment of 'added by portage for ${PN}'
616enewuser() { 450enewuser() {
617 # get the username 451 # get the username
618 local euser="$1"; shift 452 local euser=$1; shift
619 if [ -z "${euser}" ] 453 if [[ -z ${euser} ]] ; then
620 then
621 eerror "No username specified !" 454 eerror "No username specified !"
622 die "Cannot call enewuser without a username" 455 die "Cannot call enewuser without a username"
623 fi 456 fi
624 457
625 # lets see if the username already exists 458 # lets see if the username already exists
626 if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ] 459 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then
627 then
628 return 0 460 return 0
629 fi 461 fi
630 einfo "Adding user '${euser}' to your system ..." 462 einfo "Adding user '${euser}' to your system ..."
631 463
632 # options to pass to useradd 464 # options to pass to useradd
633 local opts= 465 local opts=
634 466
635 # handle uid 467 # handle uid
636 local euid="$1"; shift 468 local euid=$1; shift
637 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] 469 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then
638 then
639 if [ "${euid}" -gt 0 ] 470 if [[ ${euid} -gt 0 ]] ; then
640 then
641 if [ ! -z "`egetent passwd ${euid}`" ] 471 if [[ ! -z $(egetent passwd ${euid}) ]] ; then
642 then
643 euid="next" 472 euid="next"
644 fi 473 fi
645 else 474 else
646 eerror "Userid given but is not greater than 0 !" 475 eerror "Userid given but is not greater than 0 !"
647 die "${euid} is not a valid UID" 476 die "${euid} is not a valid UID"
648 fi 477 fi
649 else 478 else
650 euid="next" 479 euid="next"
651 fi 480 fi
652 if [ "${euid}" == "next" ] 481 if [[ ${euid} == "next" ]] ; then
653 then 482 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 483 [[ -z $(egetent passwd ${euid}) ]] && break
662 done 484 done
663 fi 485 fi
664 opts="${opts} -u ${euid}" 486 opts="${opts} -u ${euid}"
665 einfo " - Userid: ${euid}" 487 einfo " - Userid: ${euid}"
666 488
667 # handle shell 489 # handle shell
668 local eshell="$1"; shift 490 local eshell=$1; shift
669 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ] 491 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
670 then
671 if [ ! -e "${eshell}" ] 492 if [[ ! -e ${eshell} ]] ; then
672 then
673 eerror "A shell was specified but it does not exist !" 493 eerror "A shell was specified but it does not exist !"
674 die "${eshell} does not exist" 494 die "${eshell} does not exist"
675 fi 495 fi
676 else 496 else
677 if [ "${USERLAND}" == "BSD" ] 497 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null; do
678 then 498 [[ -x ${ROOT}${shell} ]] && break;
679 eshell="/usr/bin/false" 499 done
680 else 500
681 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"
682 fi 504 fi
505
506 eshell=${shell}
683 fi 507 fi
684 einfo " - Shell: ${eshell}" 508 einfo " - Shell: ${eshell}"
685 opts="${opts} -s ${eshell}" 509 opts="${opts} -s ${eshell}"
686 510
687 # handle homedir 511 # handle homedir
688 local ehome="$1"; shift 512 local ehome=$1; shift
689 if [ -z "${ehome}" ] && [ "${eshell}" != "-1" ] 513 if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then
690 then
691 ehome="/dev/null" 514 ehome="/dev/null"
692 fi 515 fi
693 einfo " - Home: ${ehome}" 516 einfo " - Home: ${ehome}"
694 opts="${opts} -d ${ehome}" 517 opts="${opts} -d ${ehome}"
695 518
696 # handle groups 519 # handle groups
697 local egroups="$1"; shift 520 local egroups=$1; shift
698 if [ ! -z "${egroups}" ] 521 if [[ ! -z ${egroups} ]] ; then
699 then
700 local oldifs="${IFS}" 522 local oldifs=${IFS}
701 local defgroup="" exgroups="" 523 local defgroup="" exgroups=""
702 524
703 export IFS="," 525 export IFS=","
704 for g in ${egroups} 526 for g in ${egroups} ; do
705 do
706 export IFS="${oldifs}" 527 export IFS=${oldifs}
707 if [ -z "`egetent group \"${g}\"`" ] 528 if [[ -z $(egetent group "${g}") ]] ; then
708 then
709 eerror "You must add group ${g} to the system first" 529 eerror "You must add group ${g} to the system first"
710 die "${g} is not a valid GID" 530 die "${g} is not a valid GID"
711 fi 531 fi
712 if [ -z "${defgroup}" ] 532 if [[ -z ${defgroup} ]] ; then
713 then
714 defgroup="${g}" 533 defgroup=${g}
715 else 534 else
716 exgroups="${exgroups},${g}" 535 exgroups="${exgroups},${g}"
717 fi 536 fi
718 export IFS="," 537 export IFS=","
719 done 538 done
720 export IFS="${oldifs}" 539 export IFS=${oldifs}
721 540
722 opts="${opts} -g ${defgroup}" 541 opts="${opts} -g ${defgroup}"
723 if [ ! -z "${exgroups}" ] 542 if [[ ! -z ${exgroups} ]] ; then
724 then
725 opts="${opts} -G ${exgroups:1}" 543 opts="${opts} -G ${exgroups:1}"
726 fi 544 fi
727 else 545 else
728 egroups="(none)" 546 egroups="(none)"
729 fi 547 fi
730 einfo " - Groups: ${egroups}" 548 einfo " - Groups: ${egroups}"
731 549
732 # handle extra and add the user 550 # handle extra and add the user
733 local eextra="$@"
734 local oldsandbox="${SANDBOX_ON}" 551 local oldsandbox=${SANDBOX_ON}
735 export SANDBOX_ON="0" 552 export SANDBOX_ON="0"
736 if useq ppc-macos 553 case ${USERLAND} in
737 then 554 Darwin)
738 ### Make the user 555 ### Make the user
739 if [ -z "${eextra}" ] 556 if [[ -z $@ ]] ; then
740 then
741 dscl . create /users/${euser} uid ${euid} 557 dscl . create /users/${euser} uid ${euid}
742 dscl . create /users/${euser} shell ${eshell} 558 dscl . create /users/${euser} shell ${eshell}
743 dscl . create /users/${euser} home ${ehome} 559 dscl . create /users/${euser} home ${ehome}
744 dscl . create /users/${euser} realname "added by portage for ${PN}" 560 dscl . create /users/${euser} realname "added by portage for ${PN}"
745 ### Add the user to the groups specified 561 ### Add the user to the groups specified
746 local oldifs="${IFS}" 562 local oldifs=${IFS}
747 export IFS="," 563 export IFS=","
748 for g in ${egroups} 564 for g in ${egroups} ; do
749 do
750 dscl . merge /groups/${g} users ${euser} 565 dscl . merge /groups/${g} users ${euser}
751 done 566 done
752 export IFS="${oldifs}" 567 export IFS=${oldifs}
753 else 568 else
754 einfo "Extra options are not supported on macos yet" 569 einfo "Extra options are not supported on Darwin yet"
755 einfo "Please report the ebuild along with the info below" 570 einfo "Please report the ebuild along with the info below"
756 einfo "eextra: ${eextra}" 571 einfo "eextra: $@"
757 die "Required function missing" 572 die "Required function missing"
758 fi 573 fi
759 elif use x86-fbsd ; then 574 ;;
760 if [ -z "${eextra}" ] 575 BSD)
761 then 576 if [[ -z $@ ]] ; then
762 pw useradd ${euser} ${opts} \ 577 pw useradd ${euser} ${opts} \
763 -c "added by portage for ${PN}" \ 578 -c "added by portage for ${PN}" \
764 die "enewuser failed" 579 die "enewuser failed"
765 else 580 else
766 einfo " - Extra: ${eextra}" 581 einfo " - Extra: $@"
767 pw useradd ${euser} ${opts} \ 582 pw useradd ${euser} ${opts} \
768 -c ${eextra} || die "enewuser failed" 583 "$@" || die "enewuser failed"
769 fi 584 fi
770 else 585 ;;
771 if [ -z "${eextra}" ] 586 *)
772 then 587 if [[ -z $@ ]] ; then
773 useradd ${opts} ${euser} \ 588 useradd ${opts} ${euser} \
774 -c "added by portage for ${PN}" \ 589 -c "added by portage for ${PN}" \
775 || die "enewuser failed" 590 || die "enewuser failed"
776 else 591 else
777 einfo " - Extra: ${eextra}" 592 einfo " - Extra: $@"
778 useradd ${opts} ${euser} ${eextra} \ 593 useradd ${opts} ${euser} "$@" \
779 || die "enewuser failed" 594 || die "enewuser failed"
780 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}"
781 fi 604 fi
605
782 export SANDBOX_ON="${oldsandbox}" 606 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} 607}
792 608
793# Simplify/standardize adding groups to the system 609# Simplify/standardize adding groups to the system
794# vapier@gentoo.org 610# vapier@gentoo.org
795# 611#
824 then 640 then
825 if [ "${egid}" -gt 0 ] 641 if [ "${egid}" -gt 0 ]
826 then 642 then
827 if [ -z "`egetent group ${egid}`" ] 643 if [ -z "`egetent group ${egid}`" ]
828 then 644 then
829 if useq ppc-macos ; then 645 if [[ "${USERLAND}" == "Darwin" ]]; then
830 opts="${opts} ${egid}" 646 opts="${opts} ${egid}"
831 else 647 else
832 opts="${opts} -g ${egid}" 648 opts="${opts} -g ${egid}"
833 fi 649 fi
834 else 650 else
848 opts="${opts} ${eextra}" 664 opts="${opts} ${eextra}"
849 665
850 # add the group 666 # add the group
851 local oldsandbox="${SANDBOX_ON}" 667 local oldsandbox="${SANDBOX_ON}"
852 export SANDBOX_ON="0" 668 export SANDBOX_ON="0"
853 if useq ppc-macos ; then 669 if [[ "${USERLAND}" == "Darwin" ]]; then
854 if [ ! -z "${eextra}" ]; 670 if [ ! -z "${eextra}" ];
855 then 671 then
856 einfo "Extra options are not supported on macos yet" 672 einfo "Extra options are not supported on Darwin/OS X yet"
857 einfo "Please report the ebuild along with the info below" 673 einfo "Please report the ebuild along with the info below"
858 einfo "eextra: ${eextra}" 674 einfo "eextra: ${eextra}"
859 die "Required function missing" 675 die "Required function missing"
860 fi 676 fi
861 677
862 # If we need the next available 678 # If we need the next available
863 case ${egid} in 679 case ${egid} in
864 *[!0-9]*) # Non numeric 680 *[!0-9]*) # Non numeric
865 for egid in `jot 898 101`; do 681 for egid in $(seq 101 999); do
866 [ -z "`egetent group ${egid}`" ] && break 682 [ -z "`egetent group ${egid}`" ] && break
867 done 683 done
868 esac 684 esac
869 dscl . create /groups/${egroup} gid ${egid} 685 dscl . create /groups/${egroup} gid ${egid}
870 dscl . create /groups/${egroup} passwd '*' 686 dscl . create /groups/${egroup} passwd '*'
871 elif use x86-fbsd ; then 687 elif [[ "${USERLAND}" == "BSD" ]] ; then
872 case ${egid} in 688 case ${egid} in
873 *[!0-9]*) # Non numeric 689 *[!0-9]*) # Non numeric
874 for egid in `jot 898 101`; do 690 for egid in $(seq 101 999); do
875 [ -z "`egetent group ${egid}`" ] && break 691 [ -z "`egetent group ${egid}`" ] && break
876 done 692 done
877 esac 693 esac
878 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 694 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
879 else 695 else
911# name: the name that will show up in the menu 727# name: the name that will show up in the menu
912# icon: give your little like a pretty little icon ... 728# icon: give your little like a pretty little icon ...
913# this can be relative (to /usr/share/pixmaps) or 729# this can be relative (to /usr/share/pixmaps) or
914# a full path to an icon 730# a full path to an icon
915# type: what kind of application is this ? for categories: 731# type: what kind of application is this ? for categories:
916# http://www.freedesktop.org/standards/menu-spec/ 732# http://www.freedesktop.org/Standards/desktop-entry-spec
917# path: if your app needs to startup in a specific dir 733# path: if your app needs to startup in a specific dir
918make_desktop_entry() { 734make_desktop_entry() {
919 [ -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
920 736
921 local exec="${1}" 737 local exec=${1}
922 local name="${2:-${PN}}" 738 local name=${2:-${PN}}
923 local icon="${3:-${PN}.png}" 739 local icon=${3:-${PN}.png}
924 local type="${4}" 740 local type=${4}
925 local subdir="${6}" 741 local path=${5}
926 local path="${5:-${GAMES_BINDIR}}" 742
927 if [ -z "${type}" ] 743 if [[ -z ${type} ]] ; then
928 then 744 local catmaj=${CATEGORY%%-*}
929 case ${CATEGORY} in 745 local catmin=${CATEGORY##*-}
930 "app-emulation") 746 case ${catmaj} in
931 type=Emulator 747 app)
932 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
933 ;; 761 ;;
934 "games-"*) 762
935 type=Game 763 dev)
936 subdir="Games" 764 type="Development"
937 ;; 765 ;;
938 "net-"*) 766
939 type=Network 767 games)
940 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}"
941 ;; 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
942 *) 837 *)
943 type= 838 type=
944 subdir=
945 ;; 839 ;;
946 esac 840 esac
947 fi 841 fi
842 if [ "${SLOT}" == "0" ] ; then
843 local desktop_name="${PN}"
844 else
845 local desktop_name="${PN}-${SLOT}"
846 fi
948 local desktop="${T}/${exec}.desktop" 847 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
949 848
950echo "[Desktop Entry] 849echo "[Desktop Entry]
951Encoding=UTF-8 850Encoding=UTF-8
952Version=0.9.2 851Version=0.9.2
953Name=${name} 852Name=${name}
969# make_desktop_entry(<title>, <command>) 868# make_desktop_entry(<title>, <command>)
970# title: File to execute to start the Window Manager 869# title: File to execute to start the Window Manager
971# command: Name of the Window Manager 870# command: Name of the Window Manager
972 871
973make_session_desktop() { 872make_session_desktop() {
974
975 [ -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
976 [ -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
977 875
978 local title="${1}" 876 local title=$1
979 local command="${2}" 877 local command=$2
980 local desktop="${T}/${wm}.desktop" 878 local desktop=${T}/${wm}.desktop
981 879
982echo "[Desktop Entry] 880echo "[Desktop Entry]
983Encoding=UTF-8 881Encoding=UTF-8
984Name=${title} 882Name=${title}
985Comment=This session logs you into ${title} 883Comment=This session logs you into ${title}
987TryExec=${command} 885TryExec=${command}
988Type=Application" > "${desktop}" 886Type=Application" > "${desktop}"
989 887
990 insinto /usr/share/xsessions 888 insinto /usr/share/xsessions
991 doins "${desktop}" 889 doins "${desktop}"
992
993 return 0
994} 890}
995 891
996domenu() { 892domenu() {
997 local i 893 local i j
998 local j
999 insinto /usr/share/applications 894 insinto /usr/share/applications
1000 for i in ${@} 895 for i in "$@" ; do
1001 do
1002 if [ -f "${i}" ]; 896 if [[ -f ${i} ]] ; then
1003 then
1004 doins ${i} 897 doins "${i}"
1005 elif [ -d "${i}" ]; 898 elif [[ -d ${i} ]] ; then
1006 then
1007 for j in ${i}/*.desktop 899 for j in "${i}"/*.desktop ; do
1008 do
1009 doins ${j} 900 doins "${j}"
1010 done 901 done
1011 fi 902 fi
1012 done 903 done
1013} 904}
905newmenu() {
906 insinto /usr/share/applications
907 newins "$1" "$2"
908}
1014 909
1015doicon() { 910doicon() {
1016 local i 911 local i j
1017 local j
1018 insinto /usr/share/pixmaps 912 insinto /usr/share/pixmaps
1019 for i in ${@} 913 for i in "$@" ; do
1020 do
1021 if [ -f "${i}" ]; 914 if [[ -f ${i} ]] ; then
1022 then
1023 doins ${i} 915 doins "${i}"
1024 elif [ -d "${i}" ]; 916 elif [[ -d ${i} ]] ; then
1025 then
1026 for j in ${i}/*.png 917 for j in "${i}"/*.png ; do
1027 do
1028 doins ${j} 918 doins "${j}"
1029 done 919 done
1030 fi 920 fi
1031 done 921 done
922}
923newicon() {
924 insinto /usr/share/pixmaps
925 newins "$1" "$2"
1032} 926}
1033 927
1034############################################################## 928##############################################################
1035# END: Handle .desktop files and menu entries # 929# END: Handle .desktop files and menu entries #
1036############################################################## 930##############################################################
1037 931
1038 932
1039# for internal use only (unpack_pdv and unpack_makeself) 933# for internal use only (unpack_pdv and unpack_makeself)
1040find_unpackable_file() { 934find_unpackable_file() {
1041 local src="$1" 935 local src=$1
1042 if [ -z "${src}" ] 936 if [[ -z ${src} ]] ; then
1043 then
1044 src="${DISTDIR}/${A}" 937 src=${DISTDIR}/${A}
1045 else 938 else
1046 if [ -e "${DISTDIR}/${src}" ] 939 if [[ -e ${DISTDIR}/${src} ]] ; then
1047 then
1048 src="${DISTDIR}/${src}" 940 src=${DISTDIR}/${src}
1049 elif [ -e "${PWD}/${src}" ] 941 elif [[ -e ${PWD}/${src} ]] ; then
1050 then
1051 src="${PWD}/${src}" 942 src=${PWD}/${src}
1052 elif [ -e "${src}" ] 943 elif [[ -e ${src} ]] ; then
1053 then
1054 src="${src}" 944 src=${src}
1055 fi
1056 fi 945 fi
1057 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 946 fi
947 [[ ! -e ${src} ]] && return 1
1058 echo "${src}" 948 echo "${src}"
1059} 949}
1060 950
1061# Unpack those pesky pdv generated files ... 951# Unpack those pesky pdv generated files ...
1062# They're self-unpacking programs with the binary package stuffed in 952# They're self-unpacking programs with the binary package stuffed in
1077# lseek 967# lseek
1078# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 968# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
1079# lseek(3, -4, SEEK_END) = 2981250 969# lseek(3, -4, SEEK_END) = 2981250
1080# 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.
1081unpack_pdv() { 971unpack_pdv() {
1082 local src="`find_unpackable_file $1`" 972 local src=$(find_unpackable_file $1)
1083 local sizeoff_t="$2" 973 local sizeoff_t=$2
1084 974
975 [[ -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 :(" 976 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
1086 977
1087 local shrtsrc="`basename ${src}`" 978 local shrtsrc="`basename ${src}`"
1088 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 979 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1089 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 980 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\"` 981 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
1156# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1047# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1157# - If the file is not specified then unpack will utilize ${A}. 1048# - If the file is not specified then unpack will utilize ${A}.
1158# - 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
1159# the proper offset from the script itself. 1050# the proper offset from the script itself.
1160unpack_makeself() { 1051unpack_makeself() {
1161 local src="$(find_unpackable_file "$1")" 1052 local src=$(find_unpackable_file "$1")
1162 local skip="$2" 1053 local skip=$2
1163 local exe="$3" 1054 local exe=$3
1164 1055
1056 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1057
1165 local shrtsrc="$(basename "${src}")" 1058 local shrtsrc=$(basename "${src}")
1166 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1059 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1167 if [ -z "${skip}" ] 1060 if [ -z "${skip}" ]
1168 then 1061 then
1169 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1062 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`"
1170 local skip=0 1063 local skip=0
1241check_license() { 1134check_license() {
1242 local lic=$1 1135 local lic=$1
1243 if [ -z "${lic}" ] ; then 1136 if [ -z "${lic}" ] ; then
1244 lic="${PORTDIR}/licenses/${LICENSE}" 1137 lic="${PORTDIR}/licenses/${LICENSE}"
1245 else 1138 else
1246 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1139 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1247 lic="${PORTDIR}/licenses/${src}" 1140 lic="${PORTDIR}/licenses/${lic}"
1248 elif [ -e "${PWD}/${src}" ] ; then 1141 elif [ -e "${PWD}/${lic}" ] ; then
1249 lic="${PWD}/${src}" 1142 lic="${PWD}/${lic}"
1250 elif [ -e "${src}" ] ; then 1143 elif [ -e "${lic}" ] ; then
1251 lic="${src}" 1144 lic="${lic}"
1252 fi
1253 fi 1145 fi
1146 fi
1254 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1147 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1255 local l="`basename ${lic}`" 1148 local l="`basename ${lic}`"
1256 1149
1257 # here is where we check for the licenses the user already 1150 # 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 1151 # accepted ... if we don't find a match, we make the user accept
1259 local shopts=$- 1152 local shopts=$-
1430# displayed and we'll hang out here until: 1323# displayed and we'll hang out here until:
1431# (1) the file is found on a mounted cdrom 1324# (1) the file is found on a mounted cdrom
1432# (2) the user hits CTRL+C 1325# (2) the user hits CTRL+C
1433cdrom_locate_file_on_cd() { 1326cdrom_locate_file_on_cd() {
1434 while [[ -z ${CDROM_ROOT} ]] ; do 1327 while [[ -z ${CDROM_ROOT} ]] ; do
1435 local dir="$(dirname ${@})" 1328 local dir=$(dirname "$*")
1436 local file="$(basename ${@})" 1329 local file=$(basename "$*")
1437 local mline="" 1330 local mline=""
1438 local showedmsg=0 1331 local showedmsg=0
1439 1332
1440 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
1441 [[ -d ${mline}/${dir} ]] || continue 1334 [[ -d ${mline}/${dir} ]] || continue
1442 [[ ! -z $(find ${mline}/${dir} -iname ${file} -maxdepth 1) ]] \ 1335 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \
1443 && export CDROM_ROOT=${mline} 1336 && export CDROM_ROOT=${mline}
1444 done 1337 done
1445 1338
1446 if [[ -z ${CDROM_ROOT} ]] ; then 1339 if [[ -z ${CDROM_ROOT} ]] ; then
1447 echo 1340 echo
1462 fi 1355 fi
1463 showedmsg=1 1356 showedmsg=1
1464 fi 1357 fi
1465 einfo "Press return to scan for the cd again" 1358 einfo "Press return to scan for the cd again"
1466 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."
1467 read 1365 read
1468 fi 1366 fi
1469 done 1367 done
1470} 1368}
1471 1369
1481# directories and uses the intersection of the lists. 1379# directories and uses the intersection of the lists.
1482# The -u builds a list of po files found in all the 1380# The -u builds a list of po files found in all the
1483# directories and uses the union of the lists. 1381# directories and uses the union of the lists.
1484strip-linguas() { 1382strip-linguas() {
1485 local ls newls 1383 local ls newls
1486 if [ "$1" == "-i" ] || [ "$1" == "-u" ] ; then 1384 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1487 local op="$1"; shift 1385 local op=$1; shift
1488 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1386 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift
1489 local d f 1387 local d f
1490 for d in "$@" ; do 1388 for d in "$@" ; do
1491 if [ "${op}" == "-u" ] ; then 1389 if [[ ${op} == "-u" ]] ; then
1492 newls="${ls}" 1390 newls=${ls}
1493 else 1391 else
1494 newls="" 1392 newls=""
1495 fi 1393 fi
1496 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1394 for f in $(find "$d" -name '*.po' -printf '%f ') ; do
1497 if [ "${op}" == "-i" ] ; then 1395 if [[ ${op} == "-i" ]] ; then
1498 [ "${ls/ ${f} /}" != "${ls}" ] && newls="${newls} ${f}" 1396 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}"
1499 else 1397 else
1500 [ "${ls/ ${f} /}" == "${ls}" ] && newls="${newls} ${f}" 1398 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}"
1501 fi 1399 fi
1502 done 1400 done
1503 ls="${newls}" 1401 ls=${newls}
1504 done 1402 done
1505 ls="${ls//.po}" 1403 ls=${ls//.po}
1506 else 1404 else
1507 ls="$@" 1405 ls=$@
1508 fi 1406 fi
1509 1407
1510 ls=" ${ls} " 1408 ls=" ${ls} "
1511 newls="" 1409 newls=""
1512 for f in ${LINGUAS} ; do 1410 for f in ${LINGUAS} ; do
1513 if [ "${ls/ ${f} /}" != "${ls}" ] ; then 1411 if [[ ${ls/ ${f} /} != ${ls} ]] ; then
1514 newls="${newls} ${f}" 1412 newls="${newls} ${f}"
1515 else 1413 else
1516 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1414 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA"
1517 fi 1415 fi
1518 done 1416 done
1519 if [ -z "${newls}" ] ; then 1417 if [[ -z ${newls} ]] ; then
1520 unset LINGUAS 1418 export LINGUAS=""
1521 else 1419 else
1522 export LINGUAS="${newls}" 1420 export LINGUAS=${newls:1}
1523 fi 1421 fi
1524} 1422}
1525 1423
1526# moved from kernel.eclass since they are generally useful outside of 1424# moved from kernel.eclass since they are generally useful outside of
1527# kernel.eclass -iggy (20041002) 1425# kernel.eclass -iggy (20041002)
1535 while ((i--)) ; do 1433 while ((i--)) ; do
1536 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass" 1434 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1537 done 1435 done
1538 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1436 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1539 case ${ARCH} in 1437 case ${ARCH} in
1540 x86) export ARCH="i386";; 1438 x86) export ARCH="i386";;
1541 amd64) export ARCH="x86_64";; 1439 amd64) export ARCH="x86_64";;
1542 hppa) export ARCH="parisc";; 1440 hppa) export ARCH="parisc";;
1543 mips) export ARCH="mips";; 1441 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! 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!
1545 *) export ARCH="${ARCH}";; 1443 *) export ARCH="${ARCH}";;
1546 esac 1444 esac
1547} 1445}
1548 1446
1549# set's ARCH back to what portage expects 1447# set's ARCH back to what portage expects
1550set_arch_to_portage() { 1448set_arch_to_portage() {
1594 LIB=$1 1492 LIB=$1
1595 1493
1596 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1494 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1597 SONAME=`basename ${LIB}` 1495 SONAME=`basename ${LIB}`
1598 1496
1599 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."
1600 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"
1601 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,"
1602 einfo "you will need to execute the following command:" 1500 ewarn "you will need to execute the following command:"
1603 einfo " revdep-rebuild --soname ${SONAME}" 1501 ewarn " revdep-rebuild --soname ${SONAME}"
1604 einfo 1502 ewarn
1605 einfo "After doing that, you can safely remove ${LIB}" 1503 ewarn "After doing that, you can safely remove ${LIB}"
1606 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1504 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1607 fi 1505 fi
1608} 1506}
1609 1507
1610# 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
1611# certain USE flags 1509# certain USE flags
1657dopamd() { 1555dopamd() {
1658 [[ -z $1 ]] && die "dopamd requires at least one argument" 1556 [[ -z $1 ]] && die "dopamd requires at least one argument"
1659 1557
1660 use pam || return 0 1558 use pam || return 0
1661 1559
1662 insinto /etc/pam.d 1560 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 $@" 1561 doins "$@" || die "failed to install $@"
1666} 1562}
1667# newpamd <old name> <new name> 1563# newpamd <old name> <new name>
1668# 1564#
1669# 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
1670newpamd() { 1566newpamd() {
1671 [[ $# -ne 2 ]] && die "newpamd requires two arguements" 1567 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1672 1568
1673 use pam || return 0 1569 use pam || return 0
1674 1570
1675 insinto /etc/pam.d 1571 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" 1572 newins "$1" "$2" || die "failed to install $1 as $2"
1679} 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.152  
changed lines
  Added in v.1.200

  ViewVC Help
Powered by ViewVC 1.1.20