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

Diff of /eclass/eutils.eclass

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

Revision 1.78 Revision 1.100
1# Copyright 1999-2004 Gentoo Technologies, Inc. 1# Copyright 1999-2004 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.78 2004/02/09 17:08:44 brad_mssw Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.100 2004/09/12 07:16:45 mr_bones_ 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.
10# NB: If you add anything, please comment it! 10# NB: If you add anything, please comment it!
11 11
12ECLASS=eutils 12ECLASS=eutils
13INHERITED="$INHERITED $ECLASS" 13INHERITED="$INHERITED $ECLASS"
14 14
15newdepend "!bootstrap? ( sys-devel/patch )" 15DEPEND="!bootstrap? ( sys-devel/patch )"
16 16
17DESCRIPTION="Based on the ${ECLASS} eclass" 17DESCRIPTION="Based on the ${ECLASS} eclass"
18
19# Wait for the supplied number of seconds. If no argument is supplied, defaults
20# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not
21# outputting to a terminal, don't wait. For compatability purposes, the argument
22# must be an integer greater than zero.
23# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004)
24epause() {
25 if [ -z "$EPAUSE_IGNORE" ] && [ -t 1 ] ; then
26 sleep ${1:-5}
27 fi
28}
29
30# Beep the specified number of times (defaults to five). If our output
31# is not a terminal, don't beep. If the EBEEP_IGNORE env var is set,
32# don't beep.
33# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004)
34ebeep() {
35 local n
36 if [ -z "$EBEEP_IGNORE" ] && [ -t 1 ] ; then
37 for ((n=1 ; n <= ${1:-5} ; n++)) ; do
38 echo -ne "\a"
39 sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
40 echo -ne "\a"
41 sleep 1
42 done
43 fi
44}
45
46# This function simply returns the desired lib directory. With portage
47# 2.0.51, we now have support for installing libraries to lib32/lib64
48# to accomidate the needs of multilib systems. It's no longer a good idea
49# to assume all libraries will end up in lib. Replace any (sane) instances
50# where lib is named directly with $(get_libdir) if possible.
51#
52# Travis Tilley <lv@gentoo.org> (24 Aug 2004)
53get_libdir() {
54 if [ ! -z "${CONF_LIBDIR_OVERRIDE}" ] ; then
55 # if there is an override, we want to use that... always.
56 CONF_LIBDIR="${CONF_LIBDIR_OVERRIDE}"
57 elif portageq has_version / '<sys-apps/portage-2.0.51_pre20' ; then
58 # and if there isnt an override, and we're using a version of
59 # portage without CONF_LIBDIR support, force the use of lib. dolib
60 # and friends from portage 2.0.50 wont be too happy otherwise.
61 CONF_LIBDIR="lib"
62 fi
63 # and of course, default to lib if CONF_LIBDIR isnt set
64 echo ${CONF_LIBDIR:=lib}
65}
66
67# Sometimes you need to override the value returned by get_libdir. A good
68# example of this is xorg-x11, where lib32 isnt a supported configuration,
69# and where lib64 -must- be used on amd64 (for applications that need lib
70# to be 32bit, such as adobe acrobat). Note that this override also bypasses
71# portage version sanity checking.
72# get_libdir_override expects one argument, the result get_libdir should
73# return:
74#
75# get_libdir_override lib64
76#
77# Travis Tilley <lv@gentoo.org> (31 Aug 2004)
78get_libdir_override() {
79 CONF_LIBDIR="$1"
80 CONF_LIBDIR_OVERRIDE="$1"
81}
18 82
19# This function generate linker scripts in /usr/lib for dynamic 83# This function generate linker scripts in /usr/lib for dynamic
20# libs in /lib. This is to fix linking problems when you have 84# libs in /lib. This is to fix linking problems when you have
21# the .so in /lib, and the .a in /usr/lib. What happens is that 85# the .so in /lib, and the .a in /usr/lib. What happens is that
22# in some cases when linking dynamic, the .a in /usr/lib is used 86# in some cases when linking dynamic, the .a in /usr/lib is used
33# to point to the latest version of the library present. 97# to point to the latest version of the library present.
34# 98#
35# <azarah@gentoo.org> (26 Oct 2002) 99# <azarah@gentoo.org> (26 Oct 2002)
36# 100#
37gen_usr_ldscript() { 101gen_usr_ldscript() {
38
39 # Just make sure it exists 102 # Just make sure it exists
40 dodir /usr/lib 103 dodir /usr/$(get_libdir)
41 104
42 cat > ${D}/usr/lib/$1 <<"END_LDSCRIPT" 105 cat > ${D}/usr/$(get_libdir)/$1 <<"END_LDSCRIPT"
43/* GNU ld script 106/* GNU ld script
44 Because Gentoo have critical dynamic libraries 107 Because Gentoo have critical dynamic libraries
45 in /lib, and the static versions in /usr/lib, we 108 in /lib, and the static versions in /usr/lib, we
46 need to have a "fake" dynamic lib in /usr/lib, 109 need to have a "fake" dynamic lib in /usr/lib,
47 otherwise we run into linking problems. 110 otherwise we run into linking problems.
48 See bug #4411 on http://bugs.gentoo.org/ for 111 See bug #4411 on http://bugs.gentoo.org/ for
49 more info. */ 112 more info. */
50GROUP ( /lib/libxxx )
51END_LDSCRIPT 113END_LDSCRIPT
52 114
115 echo "GROUP ( /$(get_libdir)/libxxx )" >> ${D}/usr/$(get_libdir)/$1
53 dosed "s:libxxx:$1:" /usr/lib/$1 116 dosed "s:libxxx:$1:" /usr/$(get_libdir)/$1
54 117
55 return 0 118 return 0
56} 119}
57 120
58# Simple function to draw a line consisting of '=' the same length as $* 121# Simple function to draw a line consisting of '=' the same length as $*
144 local SINGLE_PATCH="no" 207 local SINGLE_PATCH="no"
145 local x="" 208 local x=""
146 209
147 if [ "$#" -gt 1 ] 210 if [ "$#" -gt 1 ]
148 then 211 then
149 eerror "Invalid arguments to epatch()" 212 local m=""
150 die "Invalid arguments to epatch()" 213 einfo "${#} patches to apply..."
214 for m in "$@" ; do
215 epatch "${m}"
216 done
217 return 0
151 fi 218 fi
152 219
153 if [ -n "$1" -a -f "$1" ] 220 if [ -n "$1" -a -f "$1" ]
154 then 221 then
155 SINGLE_PATCH="yes" 222 SINGLE_PATCH="yes"
258 else 325 else
259 PATCH_TARGET="${x}" 326 PATCH_TARGET="${x}"
260 fi 327 fi
261 328
262 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 329 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
263 echo "patch ${popts} -p${count} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 330 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
264 331
265 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 332 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
266 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 333 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
267 334
268 if [ "${PATCH_SUFFIX}" != "patch" ] 335 if [ "${PATCH_SUFFIX}" != "patch" ]
275 count=5 342 count=5
276 break 343 break
277 fi 344 fi
278 fi 345 fi
279 346
280 if (cat ${PATCH_TARGET} | patch ${popts} --dry-run -f -p${count}) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1 347 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1
281 then 348 then
282 draw_line "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 349 draw_line "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real
283 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 350 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real
284 echo "ACTUALLY APPLYING ${x##*/}..." >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 351 echo "ACTUALLY APPLYING ${x##*/}..." >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real
285 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 352 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real
286 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 353 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real
287 354
288 cat ${PATCH_TARGET} | patch ${popts} -p${count} >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 2>&1 355 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 2>&1
289 356
290 if [ "$?" -ne 0 ] 357 if [ "$?" -ne 0 ]
291 then 358 then
292 cat ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 359 cat ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
293 echo 360 echo
336# This function return true if we are using the NPTL pthreads 403# This function return true if we are using the NPTL pthreads
337# implementation. 404# implementation.
338# 405#
339# <azarah@gentoo.org> (06 March 2003) 406# <azarah@gentoo.org> (06 March 2003)
340# 407#
341
342have_NPTL() { 408have_NPTL() {
343
344 cat > ${T}/test-nptl.c <<-"END" 409 cat > ${T}/test-nptl.c <<-"END"
345 #define _XOPEN_SOURCE 410 #define _XOPEN_SOURCE
346 #include <unistd.h> 411 #include <unistd.h>
347 #include <stdio.h> 412 #include <stdio.h>
348 413
431 then 496 then
432 jobs="$((`grep -c ^processor /proc/cpuinfo` * 2))" 497 jobs="$((`grep -c ^processor /proc/cpuinfo` * 2))"
433 else 498 else
434 jobs=2 499 jobs=2
435 fi 500 fi
501 elif [ "${ARCH}" = "s390" ]
502 then
503 # s390 has "# processors : "
504 jobs="$((`grep "^\# processors" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
436 else 505 else
437 jobs="$((`grep -c ^cpu /proc/cpuinfo` * 2))" 506 jobs="$((`grep -c ^cpu /proc/cpuinfo` * 2))"
438 die "Unknown ARCH -- ${ARCH}!" 507 die "Unknown ARCH -- ${ARCH}!"
439 fi 508 fi
440 509
456 fi 525 fi
457 fi 526 fi
458} 527}
459 528
460# Cheap replacement for when debianutils (and thus mktemp) 529# Cheap replacement for when debianutils (and thus mktemp)
461# do not exist on the users system 530# does not exist on the users system
462# vapier@gentoo.org 531# vapier@gentoo.org
463# 532#
464# Takes just 1 parameter (the directory to create tmpfile in) 533# Takes just 1 parameter (the directory to create tmpfile in)
465mymktemp() { 534mymktemp() {
466 local topdir="$1" 535 local topdir="$1"
467 536
468 [ -z "${topdir}" ] && topdir=/tmp 537 [ -z "${topdir}" ] && topdir=/tmp
469 if [ "`which mktemp 2>/dev/null`" ] 538 if [ "`which mktemp 2>/dev/null`" ]
470 then 539 then
471 mktemp -p ${topdir} 540 mktemp -p ${topdir}
472 else 541 else
473 local tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 542 local tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}"
474 touch ${tmp} 543 touch ${tmp}
475 echo ${tmp} 544 echo ${tmp}
545 fi
546}
547
548# Small wrapper for getent (Linux) and nidump (Mac OS X)
549# used in enewuser()/enewgroup()
550# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
551#
552# egetent(database, key)
553egetent() {
554 if [ "${ARCH}" == "macos" ] ; then
555 case "$2" in
556 *[!0-9]*) # Non numeric
557 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
558 ;;
559 *) # Numeric
560 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
561 ;;
562 esac
563 else
564 getent $1 $2
476 fi 565 fi
477} 566}
478 567
479# Simplify/standardize adding users to the system 568# Simplify/standardize adding users to the system
480# vapier@gentoo.org 569# vapier@gentoo.org
496 then 585 then
497 eerror "No username specified !" 586 eerror "No username specified !"
498 die "Cannot call enewuser without a username" 587 die "Cannot call enewuser without a username"
499 fi 588 fi
500 589
501 # setup a file for testing usernames/groups
502 local tmpfile="`mymktemp ${T}`"
503 chown ${euser} ${tmpfile} >& /dev/null
504 local realuser="`ls -l ${tmpfile} | awk '{print $3}'`"
505
506 # see if user already exists 590 # lets see if the username already exists
507 if [ "${euser}" == "${realuser}" ] 591 if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ]
508 then 592 then
509 return 0 593 return 0
510 fi 594 fi
511 einfo "Adding user '${euser}' to your system ..." 595 einfo "Adding user '${euser}' to your system ..."
512 596
517 local euid="$1"; shift 601 local euid="$1"; shift
518 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] 602 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ]
519 then 603 then
520 if [ "${euid}" -gt 0 ] 604 if [ "${euid}" -gt 0 ]
521 then 605 then
522 opts="${opts} -u ${euid}" 606 if [ ! -z "`egetent passwd ${euid}`" ]
607 then
608 euid="next"
609 fi
523 else 610 else
524 eerror "Userid given but is not greater than 0 !" 611 eerror "Userid given but is not greater than 0 !"
525 die "${euid} is not a valid UID" 612 die "${euid} is not a valid UID"
526 fi 613 fi
527 else 614 else
528 euid="next available" 615 euid="next"
616 fi
617 if [ "${euid}" == "next" ]
618 then
619 local pwrange
620 if [ "${ARCH}" == "macos" ] ; then
621 pwrange="`jot 898 101`"
622 else
623 pwrange="`seq 101 999`"
529 fi 624 fi
625 for euid in ${pwrange} ; do
626 [ -z "`egetent passwd ${euid}`" ] && break
627 done
628 fi
629 opts="${opts} -u ${euid}"
530 einfo " - Userid: ${euid}" 630 einfo " - Userid: ${euid}"
531 631
532 # handle shell 632 # handle shell
533 local eshell="$1"; shift 633 local eshell="$1"; shift
534 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ] 634 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ]
555 655
556 # handle groups 656 # handle groups
557 local egroups="$1"; shift 657 local egroups="$1"; shift
558 if [ ! -z "${egroups}" ] 658 if [ ! -z "${egroups}" ]
559 then 659 then
560 local realgroup=
561 local oldifs="${IFS}" 660 local oldifs="${IFS}"
562 export IFS="," 661 export IFS=","
563 for g in ${egroups} 662 for g in ${egroups}
564 do 663 do
565 chgrp ${g} ${tmpfile} >& /dev/null 664 if [ -z "`egetent group \"${g}\"`" ]
566 realgroup="`ls -l ${tmpfile} | awk '{print $4}'`"
567 if [ "${g}" != "${realgroup}" ]
568 then 665 then
569 eerror "You must add ${g} to the system first" 666 eerror "You must add group ${g} to the system first"
570 die "${g} is not a valid GID" 667 die "${g} is not a valid GID"
571 fi 668 fi
572 done 669 done
573 export IFS="${oldifs}" 670 export IFS="${oldifs}"
574 opts="${opts} -g ${egroups}" 671 opts="${opts} -g ${egroups}"
579 676
580 # handle extra and add the user 677 # handle extra and add the user
581 local eextra="$@" 678 local eextra="$@"
582 local oldsandbox="${SANDBOX_ON}" 679 local oldsandbox="${SANDBOX_ON}"
583 export SANDBOX_ON="0" 680 export SANDBOX_ON="0"
681 if [ "${ARCH}" == "macos" ];
682 then
683 ### Make the user
584 if [ -z "${eextra}" ] 684 if [ -z "${eextra}" ]
585 then 685 then
686 dscl . create /users/${euser} uid ${euid}
687 dscl . create /users/${euser} shell ${eshell}
688 dscl . create /users/${euser} home ${ehome}
689 dscl . create /users/${euser} realname "added by portage for ${PN}"
690 ### Add the user to the groups specified
691 for g in ${egroups}
692 do
693 dscl . merge /groups/${g} users ${euser}
694 done
695 else
696 einfo "Extra options are not supported on macos yet"
697 einfo "Please report the ebuild along with the info below"
698 einfo "eextra: ${eextra}"
699 die "Required function missing"
700 fi
701 else
702 if [ -z "${eextra}" ]
703 then
586 useradd ${opts} ${euser} \ 704 useradd ${opts} ${euser} \
587 -c "added by portage for ${PN}" \ 705 -c "added by portage for ${PN}" \
588 || die "enewuser failed" 706 || die "enewuser failed"
589 else 707 else
590 einfo " - Extra: ${eextra}" 708 einfo " - Extra: ${eextra}"
591 useradd ${opts} ${euser} ${eextra} \ 709 useradd ${opts} ${euser} ${eextra} \
592 || die "enewuser failed" 710 || die "enewuser failed"
711 fi
593 fi 712 fi
594 export SANDBOX_ON="${oldsandbox}" 713 export SANDBOX_ON="${oldsandbox}"
595 714
596 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ] 715 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ]
597 then 716 then
618 then 737 then
619 eerror "No group specified !" 738 eerror "No group specified !"
620 die "Cannot call enewgroup without a group" 739 die "Cannot call enewgroup without a group"
621 fi 740 fi
622 741
623 # setup a file for testing groupname
624 local tmpfile="`mymktemp ${T}`"
625 chgrp ${egroup} ${tmpfile} >& /dev/null
626 local realgroup="`ls -l ${tmpfile} | awk '{print $4}'`"
627
628 # see if group already exists 742 # see if group already exists
629 if [ "${egroup}" == "${realgroup}" ] 743 if [ "${egroup}" == "`egetent group \"${egroup}\" | cut -d: -f1`" ]
630 then 744 then
631 return 0 745 return 0
632 fi 746 fi
633 einfo "Adding group '${egroup}' to your system ..." 747 einfo "Adding group '${egroup}' to your system ..."
634 748
639 local egid="$1"; shift 753 local egid="$1"; shift
640 if [ ! -z "${egid}" ] 754 if [ ! -z "${egid}" ]
641 then 755 then
642 if [ "${egid}" -gt 0 ] 756 if [ "${egid}" -gt 0 ]
643 then 757 then
758 if [ -z "`egetent group ${egid}`" ]
759 then
760 if [ "${ARCH}" == "macos" ] ; then
761 opts="${opts} ${egid}"
762 else
644 opts="${opts} -g ${egid}" 763 opts="${opts} -g ${egid}"
764 fi
765 else
766 egid="next available; requested gid taken"
767 fi
645 else 768 else
646 eerror "Groupid given but is not greater than 0 !" 769 eerror "Groupid given but is not greater than 0 !"
647 die "${egid} is not a valid GID" 770 die "${egid} is not a valid GID"
648 fi 771 fi
649 else 772 else
656 opts="${opts} ${eextra}" 779 opts="${opts} ${eextra}"
657 780
658 # add the group 781 # add the group
659 local oldsandbox="${SANDBOX_ON}" 782 local oldsandbox="${SANDBOX_ON}"
660 export SANDBOX_ON="0" 783 export SANDBOX_ON="0"
784 if [ "${ARCH}" == "macos" ];
785 then
786 if [ ! -z "${eextra}" ];
787 then
788 einfo "Extra options are not supported on macos yet"
789 einfo "Please report the ebuild along with the info below"
790 einfo "eextra: ${eextra}"
791 die "Required function missing"
792 fi
793
794 # If we need the next available
795 case ${egid} in
796 *[!0-9]*) # Non numeric
797 for egid in `jot 898 101`; do
798 [ -z "`egetent group ${egid}`" ] && break
799 done
800 esac
801 dscl . create /groups/${egroup} gid ${egid}
802 dscl . create /groups/${egroup} passwd '*'
803 else
661 groupadd ${opts} ${egroup} || die "enewgroup failed" 804 groupadd ${opts} ${egroup} || die "enewgroup failed"
805 fi
662 export SANDBOX_ON="${oldsandbox}" 806 export SANDBOX_ON="${oldsandbox}"
663} 807}
664 808
665# Simple script to replace 'dos2unix' binaries 809# Simple script to replace 'dos2unix' binaries
666# vapier@gentoo.org 810# vapier@gentoo.org
687# name: the name that will show up in the menu 831# name: the name that will show up in the menu
688# icon: give your little like a pretty little icon ... 832# icon: give your little like a pretty little icon ...
689# this can be relative (to /usr/share/pixmaps) or 833# this can be relative (to /usr/share/pixmaps) or
690# a full path to an icon 834# a full path to an icon
691# type: what kind of application is this ? for categories: 835# type: what kind of application is this ? for categories:
692# http://www.freedesktop.org/standards/menu/draft/menu-spec/menu-spec.html 836# http://www.freedesktop.org/standards/menu-spec/
693# path: if your app needs to startup in a specific dir 837# path: if your app needs to startup in a specific dir
694make_desktop_entry() { 838make_desktop_entry() {
695 [ -z "$1" ] && eerror "You must specify the executable" && return 1 839 [ -z "$1" ] && eerror "You must specify the executable" && return 1
696 840
697 local exec="${1}" 841 local exec="${1}"
698 local name="${2:-${PN}}" 842 local name="${2:-${PN}}"
699 local icon="${3:-${PN}.png}" 843 local icon="${3:-${PN}.png}"
700 local type="${4}" 844 local type="${4}"
845 local subdir="${6}"
701 local path="${5:-${GAMES_PREFIX}}" 846 local path="${5:-${GAMES_BINDIR}}"
702 if [ -z "${type}" ] 847 if [ -z "${type}" ]
703 then 848 then
704 case ${CATEGORY} in 849 case ${CATEGORY} in
705 "app-emulation") 850 "app-emulation")
706 type=Emulator 851 type=Emulator
852 subdir="Emulation"
707 ;; 853 ;;
708 "games-"*) 854 "games-"*)
709 type=Game 855 type=Game
856 subdir="Games"
710 ;; 857 ;;
711 "net-"*) 858 "net-"*)
712 type=Network; 859 type=Network
860 subdir="${type}"
713 ;; 861 ;;
714 *) 862 *)
715 type= 863 type=
864 subdir=
716 ;; 865 ;;
717 esac 866 esac
718 fi 867 fi
719 local desktop="${T}/${exec}.desktop" 868 local desktop="${T}/${exec}.desktop"
720 869
725Type=Application 874Type=Application
726Comment=${DESCRIPTION} 875Comment=${DESCRIPTION}
727Exec=${exec} 876Exec=${exec}
728Path=${path} 877Path=${path}
729Icon=${icon} 878Icon=${icon}
730Categories=Application;${type};" > ${desktop} 879Categories=Application;${type};" > "${desktop}"
731 880
732 if [ -d "/usr/share/applications" ] 881 if [ -d "/usr/share/applications" ]
733 then 882 then
734 insinto /usr/share/applications 883 insinto /usr/share/applications
735 doins ${desktop} 884 doins "${desktop}"
736 fi 885 fi
737 886
738 #if [ -d "/usr/share/gnome/apps" ] 887 #if [ -d "/usr/share/gnome/apps" ]
739 #then 888 #then
740 # insinto /usr/share/gnome/apps/Games 889 # insinto /usr/share/gnome/apps/Games
750 # done 899 # done
751 #fi 900 #fi
752 901
753 if [ -d "/usr/share/applnk" ] 902 if [ -d "/usr/share/applnk" ]
754 then 903 then
755 insinto /usr/share/applnk/${type} 904 insinto /usr/share/applnk/${subdir}
756 doins ${desktop} 905 doins "${desktop}"
757 fi 906 fi
758 907
759 return 0 908 return 0
760} 909}
761 910
932 tail -n +${skip} ${src} | bzip2 -dc | tar --no-same-owner -xf - 1081 tail -n +${skip} ${src} | bzip2 -dc | tar --no-same-owner -xf -
933 ;; 1082 ;;
934 gzip*) 1083 gzip*)
935 tail -n +${skip} ${src} | tar --no-same-owner -xzf - 1084 tail -n +${skip} ${src} | tar --no-same-owner -xzf -
936 ;; 1085 ;;
1086 compress*)
1087 tail -n +${skip} ${src} | gunzip | tar --no-same-owner -xf -
1088 ;;
937 *) 1089 *)
1090 eerror "Unknown filetype \"${filetype}\" ?"
938 false 1091 false
939 ;; 1092 ;;
940 esac 1093 esac
941 assert "failure unpacking (${filetype}) makeself ${shrtsrc} ('${ver}' +${skip})" 1094 assert "failure unpacking (${filetype}) makeself ${shrtsrc} ('${ver}' +${skip})"
942} 1095}
1100# remember, you can only go forward in the cd chain, you can't go back. 1253# remember, you can only go forward in the cd chain, you can't go back.
1101cdrom_load_next_cd() { 1254cdrom_load_next_cd() {
1102 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1)) 1255 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1103 local var= 1256 local var=
1104 1257
1258 if [ ! -z "${CD_ROOT}" ] ; then
1259 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1260 return
1261 fi
1262
1105 unset CDROM_ROOT 1263 unset CDROM_ROOT
1106 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1264 var=CDROM_ROOTS_${CDROM_CURRENT_CD}
1107 if [ -z "${!var}" ] ; then 1265 if [ -z "${!var}" ] ; then
1108 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1266 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1109 cdrom_locate_file_on_cd ${!var} 1267 cdrom_locate_file_on_cd ${!var}
1157 einfo "or hit CTRL+C to abort the emerge." 1315 einfo "or hit CTRL+C to abort the emerge."
1158 read 1316 read
1159 fi 1317 fi
1160 done 1318 done
1161} 1319}
1320
1321# Make sure that LINGUAS only contains languages that
1322# a package can support
1323#
1324# usage: strip-linguas <allow LINGUAS>
1325# strip-linguas -i <directories of .po files>
1326# strip-linguas -u <directories of .po files>
1327#
1328# The first form allows you to specify a list of LINGUAS.
1329# The -i builds a list of po files found in all the
1330# directories and uses the intersection of the lists.
1331# The -u builds a list of po files found in all the
1332# directories and uses the union of the lists.
1333strip-linguas() {
1334 local ls newls
1335 if [ "$1" == "-i" ] || [ "$1" == "-u" ] ; then
1336 local op="$1"; shift
1337 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift
1338 local d f
1339 for d in "$@" ; do
1340 if [ "${op}" == "-u" ] ; then
1341 newls="${ls}"
1342 else
1343 newls=""
1344 fi
1345 for f in $(find "$d" -name '*.po' -printf '%f ') ; do
1346 if [ "${op}" == "-i" ] ; then
1347 [ "${ls/ ${f} /}" != "${ls}" ] && newls="${newls} ${f}"
1348 else
1349 [ "${ls/ ${f} /}" == "${ls}" ] && newls="${newls} ${f}"
1350 fi
1351 done
1352 ls="${newls}"
1353 done
1354 ls="${ls//.po}"
1355 else
1356 ls="$@"
1357 fi
1358
1359 ls=" ${ls} "
1360 newls=""
1361 for f in ${LINGUAS} ; do
1362 if [ "${ls/ ${f} /}" != "${ls}" ] ; then
1363 nl="${newls} ${f}"
1364 else
1365 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA"
1366 fi
1367 done
1368 if [ -z "${newls}" ] ; then
1369 unset LINGUAS
1370 else
1371 export LINGUAS="${newls}"
1372 fi
1373}

Legend:
Removed from v.1.78  
changed lines
  Added in v.1.100

  ViewVC Help
Powered by ViewVC 1.1.20