/[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.102
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.102 2004/09/16 14:05:07 usata 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
68get_multilibdir() {
69 echo ${CONF_MULTILIBDIR:=lib32}
70}
71
72
73# Sometimes you need to override the value returned by get_libdir. A good
74# example of this is xorg-x11, where lib32 isnt a supported configuration,
75# and where lib64 -must- be used on amd64 (for applications that need lib
76# to be 32bit, such as adobe acrobat). Note that this override also bypasses
77# portage version sanity checking.
78# get_libdir_override expects one argument, the result get_libdir should
79# return:
80#
81# get_libdir_override lib64
82#
83# Travis Tilley <lv@gentoo.org> (31 Aug 2004)
84get_libdir_override() {
85 CONF_LIBDIR="$1"
86 CONF_LIBDIR_OVERRIDE="$1"
87}
18 88
19# This function generate linker scripts in /usr/lib for dynamic 89# This function generate linker scripts in /usr/lib for dynamic
20# libs in /lib. This is to fix linking problems when you have 90# 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 91# 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 92# in some cases when linking dynamic, the .a in /usr/lib is used
… …
33# to point to the latest version of the library present. 103# to point to the latest version of the library present.
34# 104#
35# <azarah@gentoo.org> (26 Oct 2002) 105# <azarah@gentoo.org> (26 Oct 2002)
36# 106#
37gen_usr_ldscript() { 107gen_usr_ldscript() {
38
39 # Just make sure it exists 108 # Just make sure it exists
40 dodir /usr/lib 109 dodir /usr/$(get_libdir)
41 110
42 cat > ${D}/usr/lib/$1 <<"END_LDSCRIPT" 111 cat > ${D}/usr/$(get_libdir)/$1 <<"END_LDSCRIPT"
43/* GNU ld script 112/* GNU ld script
44 Because Gentoo have critical dynamic libraries 113 Because Gentoo have critical dynamic libraries
45 in /lib, and the static versions in /usr/lib, we 114 in /lib, and the static versions in /usr/lib, we
46 need to have a "fake" dynamic lib in /usr/lib, 115 need to have a "fake" dynamic lib in /usr/lib,
47 otherwise we run into linking problems. 116 otherwise we run into linking problems.
48 See bug #4411 on http://bugs.gentoo.org/ for 117 See bug #4411 on http://bugs.gentoo.org/ for
49 more info. */ 118 more info. */
50GROUP ( /lib/libxxx )
51END_LDSCRIPT 119END_LDSCRIPT
52 120
121 echo "GROUP ( /$(get_libdir)/libxxx )" >> ${D}/usr/$(get_libdir)/$1
53 dosed "s:libxxx:$1:" /usr/lib/$1 122 dosed "s:libxxx:$1:" /usr/$(get_libdir)/$1
54 123
55 return 0 124 return 0
56} 125}
57 126
58# Simple function to draw a line consisting of '=' the same length as $* 127# Simple function to draw a line consisting of '=' the same length as $*
… …
144 local SINGLE_PATCH="no" 213 local SINGLE_PATCH="no"
145 local x="" 214 local x=""
146 215
147 if [ "$#" -gt 1 ] 216 if [ "$#" -gt 1 ]
148 then 217 then
149 eerror "Invalid arguments to epatch()" 218 local m=""
150 die "Invalid arguments to epatch()" 219 einfo "${#} patches to apply..."
220 for m in "$@" ; do
221 epatch "${m}"
222 done
223 return 0
151 fi 224 fi
152 225
153 if [ -n "$1" -a -f "$1" ] 226 if [ -n "$1" -a -f "$1" ]
154 then 227 then
155 SINGLE_PATCH="yes" 228 SINGLE_PATCH="yes"
… …
258 else 331 else
259 PATCH_TARGET="${x}" 332 PATCH_TARGET="${x}"
260 fi 333 fi
261 334
262 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 335 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
263 echo "patch ${popts} -p${count} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 336 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
264 337
265 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 338 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
266 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 339 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
267 340
268 if [ "${PATCH_SUFFIX}" != "patch" ] 341 if [ "${PATCH_SUFFIX}" != "patch" ]
… …
275 count=5 348 count=5
276 break 349 break
277 fi 350 fi
278 fi 351 fi
279 352
280 if (cat ${PATCH_TARGET} | patch ${popts} --dry-run -f -p${count}) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1 353 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1
281 then 354 then
282 draw_line "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 355 draw_line "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real
283 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 356 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real
284 echo "ACTUALLY APPLYING ${x##*/}..." >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 357 echo "ACTUALLY APPLYING ${x##*/}..." >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real
285 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 358 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real
286 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 359 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real
287 360
288 cat ${PATCH_TARGET} | patch ${popts} -p${count} >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 2>&1 361 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 2>&1
289 362
290 if [ "$?" -ne 0 ] 363 if [ "$?" -ne 0 ]
291 then 364 then
292 cat ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 365 cat ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
293 echo 366 echo
… …
336# This function return true if we are using the NPTL pthreads 409# This function return true if we are using the NPTL pthreads
337# implementation. 410# implementation.
338# 411#
339# <azarah@gentoo.org> (06 March 2003) 412# <azarah@gentoo.org> (06 March 2003)
340# 413#
341
342have_NPTL() { 414have_NPTL() {
343
344 cat > ${T}/test-nptl.c <<-"END" 415 cat > ${T}/test-nptl.c <<-"END"
345 #define _XOPEN_SOURCE 416 #define _XOPEN_SOURCE
346 #include <unistd.h> 417 #include <unistd.h>
347 #include <stdio.h> 418 #include <stdio.h>
348 419
… …
431 then 502 then
432 jobs="$((`grep -c ^processor /proc/cpuinfo` * 2))" 503 jobs="$((`grep -c ^processor /proc/cpuinfo` * 2))"
433 else 504 else
434 jobs=2 505 jobs=2
435 fi 506 fi
507 elif [ "${ARCH}" = "s390" ]
508 then
509 # s390 has "# processors : "
510 jobs="$((`grep "^\# processors" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
436 else 511 else
437 jobs="$((`grep -c ^cpu /proc/cpuinfo` * 2))" 512 jobs="$((`grep -c ^cpu /proc/cpuinfo` * 2))"
438 die "Unknown ARCH -- ${ARCH}!" 513 die "Unknown ARCH -- ${ARCH}!"
439 fi 514 fi
440 515
… …
456 fi 531 fi
457 fi 532 fi
458} 533}
459 534
460# Cheap replacement for when debianutils (and thus mktemp) 535# Cheap replacement for when debianutils (and thus mktemp)
461# do not exist on the users system 536# does not exist on the users system
462# vapier@gentoo.org 537# vapier@gentoo.org
463# 538#
464# Takes just 1 parameter (the directory to create tmpfile in) 539# Takes just 1 parameter (the directory to create tmpfile in)
465mymktemp() { 540mymktemp() {
466 local topdir="$1" 541 local topdir="$1"
467 542
468 [ -z "${topdir}" ] && topdir=/tmp 543 [ -z "${topdir}" ] && topdir=/tmp
469 if [ "`which mktemp 2>/dev/null`" ] 544 if [ "`which mktemp 2>/dev/null`" ]
470 then 545 then
471 mktemp -p ${topdir} 546 mktemp -p ${topdir}
472 else 547 else
473 local tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 548 local tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}"
474 touch ${tmp} 549 touch ${tmp}
475 echo ${tmp} 550 echo ${tmp}
551 fi
552}
553
554# Small wrapper for getent (Linux) and nidump (Mac OS X)
555# used in enewuser()/enewgroup()
556# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
557#
558# egetent(database, key)
559egetent() {
560 if use macos || use ppc-macos ; then
561 case "$2" in
562 *[!0-9]*) # Non numeric
563 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
564 ;;
565 *) # Numeric
566 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
567 ;;
568 esac
569 else
570 getent $1 $2
476 fi 571 fi
477} 572}
478 573
479# Simplify/standardize adding users to the system 574# Simplify/standardize adding users to the system
480# vapier@gentoo.org 575# vapier@gentoo.org
… …
496 then 591 then
497 eerror "No username specified !" 592 eerror "No username specified !"
498 die "Cannot call enewuser without a username" 593 die "Cannot call enewuser without a username"
499 fi 594 fi
500 595
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 596 # lets see if the username already exists
507 if [ "${euser}" == "${realuser}" ] 597 if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ]
508 then 598 then
509 return 0 599 return 0
510 fi 600 fi
511 einfo "Adding user '${euser}' to your system ..." 601 einfo "Adding user '${euser}' to your system ..."
512 602
… …
517 local euid="$1"; shift 607 local euid="$1"; shift
518 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] 608 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ]
519 then 609 then
520 if [ "${euid}" -gt 0 ] 610 if [ "${euid}" -gt 0 ]
521 then 611 then
522 opts="${opts} -u ${euid}" 612 if [ ! -z "`egetent passwd ${euid}`" ]
613 then
614 euid="next"
615 fi
523 else 616 else
524 eerror "Userid given but is not greater than 0 !" 617 eerror "Userid given but is not greater than 0 !"
525 die "${euid} is not a valid UID" 618 die "${euid} is not a valid UID"
526 fi 619 fi
527 else 620 else
528 euid="next available" 621 euid="next"
622 fi
623 if [ "${euid}" == "next" ]
624 then
625 local pwrange
626 if use macos || use ppc-macos ; then
627 pwrange="`jot 898 101`"
628 else
629 pwrange="`seq 101 999`"
529 fi 630 fi
631 for euid in ${pwrange} ; do
632 [ -z "`egetent passwd ${euid}`" ] && break
633 done
634 fi
635 opts="${opts} -u ${euid}"
530 einfo " - Userid: ${euid}" 636 einfo " - Userid: ${euid}"
531 637
532 # handle shell 638 # handle shell
533 local eshell="$1"; shift 639 local eshell="$1"; shift
534 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ] 640 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ]
… …
555 661
556 # handle groups 662 # handle groups
557 local egroups="$1"; shift 663 local egroups="$1"; shift
558 if [ ! -z "${egroups}" ] 664 if [ ! -z "${egroups}" ]
559 then 665 then
560 local realgroup=
561 local oldifs="${IFS}" 666 local oldifs="${IFS}"
562 export IFS="," 667 export IFS=","
563 for g in ${egroups} 668 for g in ${egroups}
564 do 669 do
565 chgrp ${g} ${tmpfile} >& /dev/null 670 if [ -z "`egetent group \"${g}\"`" ]
566 realgroup="`ls -l ${tmpfile} | awk '{print $4}'`"
567 if [ "${g}" != "${realgroup}" ]
568 then 671 then
569 eerror "You must add ${g} to the system first" 672 eerror "You must add group ${g} to the system first"
570 die "${g} is not a valid GID" 673 die "${g} is not a valid GID"
571 fi 674 fi
572 done 675 done
573 export IFS="${oldifs}" 676 export IFS="${oldifs}"
574 opts="${opts} -g ${egroups}" 677 opts="${opts} -g ${egroups}"
… …
579 682
580 # handle extra and add the user 683 # handle extra and add the user
581 local eextra="$@" 684 local eextra="$@"
582 local oldsandbox="${SANDBOX_ON}" 685 local oldsandbox="${SANDBOX_ON}"
583 export SANDBOX_ON="0" 686 export SANDBOX_ON="0"
687 if use macos || use ppc-macos ;
688 then
689 ### Make the user
584 if [ -z "${eextra}" ] 690 if [ -z "${eextra}" ]
585 then 691 then
692 dscl . create /users/${euser} uid ${euid}
693 dscl . create /users/${euser} shell ${eshell}
694 dscl . create /users/${euser} home ${ehome}
695 dscl . create /users/${euser} realname "added by portage for ${PN}"
696 ### Add the user to the groups specified
697 for g in ${egroups}
698 do
699 dscl . merge /groups/${g} users ${euser}
700 done
701 else
702 einfo "Extra options are not supported on macos yet"
703 einfo "Please report the ebuild along with the info below"
704 einfo "eextra: ${eextra}"
705 die "Required function missing"
706 fi
707 else
708 if [ -z "${eextra}" ]
709 then
586 useradd ${opts} ${euser} \ 710 useradd ${opts} ${euser} \
587 -c "added by portage for ${PN}" \ 711 -c "added by portage for ${PN}" \
588 || die "enewuser failed" 712 || die "enewuser failed"
589 else 713 else
590 einfo " - Extra: ${eextra}" 714 einfo " - Extra: ${eextra}"
591 useradd ${opts} ${euser} ${eextra} \ 715 useradd ${opts} ${euser} ${eextra} \
592 || die "enewuser failed" 716 || die "enewuser failed"
717 fi
593 fi 718 fi
594 export SANDBOX_ON="${oldsandbox}" 719 export SANDBOX_ON="${oldsandbox}"
595 720
596 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ] 721 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ]
597 then 722 then
… …
618 then 743 then
619 eerror "No group specified !" 744 eerror "No group specified !"
620 die "Cannot call enewgroup without a group" 745 die "Cannot call enewgroup without a group"
621 fi 746 fi
622 747
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 748 # see if group already exists
629 if [ "${egroup}" == "${realgroup}" ] 749 if [ "${egroup}" == "`egetent group \"${egroup}\" | cut -d: -f1`" ]
630 then 750 then
631 return 0 751 return 0
632 fi 752 fi
633 einfo "Adding group '${egroup}' to your system ..." 753 einfo "Adding group '${egroup}' to your system ..."
634 754
… …
639 local egid="$1"; shift 759 local egid="$1"; shift
640 if [ ! -z "${egid}" ] 760 if [ ! -z "${egid}" ]
641 then 761 then
642 if [ "${egid}" -gt 0 ] 762 if [ "${egid}" -gt 0 ]
643 then 763 then
764 if [ -z "`egetent group ${egid}`" ]
765 then
766 if use macos || use ppc-macos ; then
767 opts="${opts} ${egid}"
768 else
644 opts="${opts} -g ${egid}" 769 opts="${opts} -g ${egid}"
770 fi
771 else
772 egid="next available; requested gid taken"
773 fi
645 else 774 else
646 eerror "Groupid given but is not greater than 0 !" 775 eerror "Groupid given but is not greater than 0 !"
647 die "${egid} is not a valid GID" 776 die "${egid} is not a valid GID"
648 fi 777 fi
649 else 778 else
… …
656 opts="${opts} ${eextra}" 785 opts="${opts} ${eextra}"
657 786
658 # add the group 787 # add the group
659 local oldsandbox="${SANDBOX_ON}" 788 local oldsandbox="${SANDBOX_ON}"
660 export SANDBOX_ON="0" 789 export SANDBOX_ON="0"
790 if use macos || use ppc-macos ;
791 then
792 if [ ! -z "${eextra}" ];
793 then
794 einfo "Extra options are not supported on macos yet"
795 einfo "Please report the ebuild along with the info below"
796 einfo "eextra: ${eextra}"
797 die "Required function missing"
798 fi
799
800 # If we need the next available
801 case ${egid} in
802 *[!0-9]*) # Non numeric
803 for egid in `jot 898 101`; do
804 [ -z "`egetent group ${egid}`" ] && break
805 done
806 esac
807 dscl . create /groups/${egroup} gid ${egid}
808 dscl . create /groups/${egroup} passwd '*'
809 else
661 groupadd ${opts} ${egroup} || die "enewgroup failed" 810 groupadd ${opts} ${egroup} || die "enewgroup failed"
811 fi
662 export SANDBOX_ON="${oldsandbox}" 812 export SANDBOX_ON="${oldsandbox}"
663} 813}
664 814
665# Simple script to replace 'dos2unix' binaries 815# Simple script to replace 'dos2unix' binaries
666# vapier@gentoo.org 816# vapier@gentoo.org
… …
687# name: the name that will show up in the menu 837# name: the name that will show up in the menu
688# icon: give your little like a pretty little icon ... 838# icon: give your little like a pretty little icon ...
689# this can be relative (to /usr/share/pixmaps) or 839# this can be relative (to /usr/share/pixmaps) or
690# a full path to an icon 840# a full path to an icon
691# type: what kind of application is this ? for categories: 841# type: what kind of application is this ? for categories:
692# http://www.freedesktop.org/standards/menu/draft/menu-spec/menu-spec.html 842# http://www.freedesktop.org/standards/menu-spec/
693# path: if your app needs to startup in a specific dir 843# path: if your app needs to startup in a specific dir
694make_desktop_entry() { 844make_desktop_entry() {
695 [ -z "$1" ] && eerror "You must specify the executable" && return 1 845 [ -z "$1" ] && eerror "You must specify the executable" && return 1
696 846
697 local exec="${1}" 847 local exec="${1}"
698 local name="${2:-${PN}}" 848 local name="${2:-${PN}}"
699 local icon="${3:-${PN}.png}" 849 local icon="${3:-${PN}.png}"
700 local type="${4}" 850 local type="${4}"
851 local subdir="${6}"
701 local path="${5:-${GAMES_PREFIX}}" 852 local path="${5:-${GAMES_BINDIR}}"
702 if [ -z "${type}" ] 853 if [ -z "${type}" ]
703 then 854 then
704 case ${CATEGORY} in 855 case ${CATEGORY} in
705 "app-emulation") 856 "app-emulation")
706 type=Emulator 857 type=Emulator
858 subdir="Emulation"
707 ;; 859 ;;
708 "games-"*) 860 "games-"*)
709 type=Game 861 type=Game
862 subdir="Games"
710 ;; 863 ;;
711 "net-"*) 864 "net-"*)
712 type=Network; 865 type=Network
866 subdir="${type}"
713 ;; 867 ;;
714 *) 868 *)
715 type= 869 type=
870 subdir=
716 ;; 871 ;;
717 esac 872 esac
718 fi 873 fi
719 local desktop="${T}/${exec}.desktop" 874 local desktop="${T}/${exec}.desktop"
720 875
… …
725Type=Application 880Type=Application
726Comment=${DESCRIPTION} 881Comment=${DESCRIPTION}
727Exec=${exec} 882Exec=${exec}
728Path=${path} 883Path=${path}
729Icon=${icon} 884Icon=${icon}
730Categories=Application;${type};" > ${desktop} 885Categories=Application;${type};" > "${desktop}"
731 886
732 if [ -d "/usr/share/applications" ] 887 if [ -d "/usr/share/applications" ]
733 then 888 then
734 insinto /usr/share/applications 889 insinto /usr/share/applications
735 doins ${desktop} 890 doins "${desktop}"
736 fi 891 fi
737 892
738 #if [ -d "/usr/share/gnome/apps" ] 893 #if [ -d "/usr/share/gnome/apps" ]
739 #then 894 #then
740 # insinto /usr/share/gnome/apps/Games 895 # insinto /usr/share/gnome/apps/Games
… …
750 # done 905 # done
751 #fi 906 #fi
752 907
753 if [ -d "/usr/share/applnk" ] 908 if [ -d "/usr/share/applnk" ]
754 then 909 then
755 insinto /usr/share/applnk/${type} 910 insinto /usr/share/applnk/${subdir}
756 doins ${desktop} 911 doins "${desktop}"
757 fi 912 fi
758 913
759 return 0 914 return 0
760} 915}
761 916
… …
932 tail -n +${skip} ${src} | bzip2 -dc | tar --no-same-owner -xf - 1087 tail -n +${skip} ${src} | bzip2 -dc | tar --no-same-owner -xf -
933 ;; 1088 ;;
934 gzip*) 1089 gzip*)
935 tail -n +${skip} ${src} | tar --no-same-owner -xzf - 1090 tail -n +${skip} ${src} | tar --no-same-owner -xzf -
936 ;; 1091 ;;
1092 compress*)
1093 tail -n +${skip} ${src} | gunzip | tar --no-same-owner -xf -
1094 ;;
937 *) 1095 *)
1096 eerror "Unknown filetype \"${filetype}\" ?"
938 false 1097 false
939 ;; 1098 ;;
940 esac 1099 esac
941 assert "failure unpacking (${filetype}) makeself ${shrtsrc} ('${ver}' +${skip})" 1100 assert "failure unpacking (${filetype}) makeself ${shrtsrc} ('${ver}' +${skip})"
942} 1101}
… …
1100# remember, you can only go forward in the cd chain, you can't go back. 1259# remember, you can only go forward in the cd chain, you can't go back.
1101cdrom_load_next_cd() { 1260cdrom_load_next_cd() {
1102 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1)) 1261 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1103 local var= 1262 local var=
1104 1263
1264 if [ ! -z "${CD_ROOT}" ] ; then
1265 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1266 return
1267 fi
1268
1105 unset CDROM_ROOT 1269 unset CDROM_ROOT
1106 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1270 var=CDROM_ROOTS_${CDROM_CURRENT_CD}
1107 if [ -z "${!var}" ] ; then 1271 if [ -z "${!var}" ] ; then
1108 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1272 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1109 cdrom_locate_file_on_cd ${!var} 1273 cdrom_locate_file_on_cd ${!var}
… …
1157 einfo "or hit CTRL+C to abort the emerge." 1321 einfo "or hit CTRL+C to abort the emerge."
1158 read 1322 read
1159 fi 1323 fi
1160 done 1324 done
1161} 1325}
1326
1327# Make sure that LINGUAS only contains languages that
1328# a package can support
1329#
1330# usage: strip-linguas <allow LINGUAS>
1331# strip-linguas -i <directories of .po files>
1332# strip-linguas -u <directories of .po files>
1333#
1334# The first form allows you to specify a list of LINGUAS.
1335# The -i builds a list of po files found in all the
1336# directories and uses the intersection of the lists.
1337# The -u builds a list of po files found in all the
1338# directories and uses the union of the lists.
1339strip-linguas() {
1340 local ls newls
1341 if [ "$1" == "-i" ] || [ "$1" == "-u" ] ; then
1342 local op="$1"; shift
1343 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift
1344 local d f
1345 for d in "$@" ; do
1346 if [ "${op}" == "-u" ] ; then
1347 newls="${ls}"
1348 else
1349 newls=""
1350 fi
1351 for f in $(find "$d" -name '*.po' -printf '%f ') ; do
1352 if [ "${op}" == "-i" ] ; then
1353 [ "${ls/ ${f} /}" != "${ls}" ] && newls="${newls} ${f}"
1354 else
1355 [ "${ls/ ${f} /}" == "${ls}" ] && newls="${newls} ${f}"
1356 fi
1357 done
1358 ls="${newls}"
1359 done
1360 ls="${ls//.po}"
1361 else
1362 ls="$@"
1363 fi
1364
1365 ls=" ${ls} "
1366 newls=""
1367 for f in ${LINGUAS} ; do
1368 if [ "${ls/ ${f} /}" != "${ls}" ] ; then
1369 nl="${newls} ${f}"
1370 else
1371 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA"
1372 fi
1373 done
1374 if [ -z "${newls}" ] ; then
1375 unset LINGUAS
1376 else
1377 export LINGUAS="${newls}"
1378 fi
1379}
Legend:
Removed from v.1.78  
changed lines
  Added in v.1.102
  ViewVC Help
Powered by ViewVC 1.1.13