/[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.106
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.106 2004/09/21 17:34:33 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.
… …
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 LIBDIR_TEST=$(type econf)
55 if [ ! -z "${CONF_LIBDIR_OVERRIDE}" ] ; then
56 # if there is an override, we want to use that... always.
57 CONF_LIBDIR="${CONF_LIBDIR_OVERRIDE}"
58 # We don't need to know the verison of portage. We only need to know
59 # if there is support for CONF_LIBDIR in econf and co.
60 # Danny van Dyk <kugelfang@gentoo.org> 2004/17/09
61 #elif portageq has_version / '<sys-apps/portage-2.0.51_pre20' ; then
62 # # and if there isnt an override, and we're using a version of
63 # # portage without CONF_LIBDIR support, force the use of lib. dolib
64 # # and friends from portage 2.0.50 wont be too happy otherwise.
65 # CONF_LIBDIR="lib"
66 #fi
67 elif [ "${LIBDIR_TEST/CONF_LIBDIR}" == "${LIBDIR_TEST}" ]; then # we don't have CONF_LIBDIR support
68 # will be <portage-2.0.51_pre20
69 CONF_LIBDIR="lib"
70 fi
71 # and of course, default to lib if CONF_LIBDIR isnt set
72 echo ${CONF_LIBDIR:=lib}
73 unset LIBDIR_TEST
74}
75
76
77get_multilibdir() {
78 echo ${CONF_MULTILIBDIR:=lib32}
79}
80
81
82# Sometimes you need to override the value returned by get_libdir. A good
83# example of this is xorg-x11, where lib32 isnt a supported configuration,
84# and where lib64 -must- be used on amd64 (for applications that need lib
85# to be 32bit, such as adobe acrobat). Note that this override also bypasses
86# portage version sanity checking.
87# get_libdir_override expects one argument, the result get_libdir should
88# return:
89#
90# get_libdir_override lib64
91#
92# Travis Tilley <lv@gentoo.org> (31 Aug 2004)
93get_libdir_override() {
94 CONF_LIBDIR="$1"
95 CONF_LIBDIR_OVERRIDE="$1"
96}
18 97
19# This function generate linker scripts in /usr/lib for dynamic 98# This function generate linker scripts in /usr/lib for dynamic
20# libs in /lib. This is to fix linking problems when you have 99# 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 100# 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 101# in some cases when linking dynamic, the .a in /usr/lib is used
… …
33# to point to the latest version of the library present. 112# to point to the latest version of the library present.
34# 113#
35# <azarah@gentoo.org> (26 Oct 2002) 114# <azarah@gentoo.org> (26 Oct 2002)
36# 115#
37gen_usr_ldscript() { 116gen_usr_ldscript() {
38
39 # Just make sure it exists 117 # Just make sure it exists
40 dodir /usr/lib 118 dodir /usr/$(get_libdir)
41 119
42 cat > ${D}/usr/lib/$1 <<"END_LDSCRIPT" 120 cat > "${D}/usr/$(get_libdir)/$1" << END_LDSCRIPT
43/* GNU ld script 121/* GNU ld script
44 Because Gentoo have critical dynamic libraries 122 Because Gentoo have critical dynamic libraries
45 in /lib, and the static versions in /usr/lib, we 123 in /lib, and the static versions in /usr/lib, we
46 need to have a "fake" dynamic lib in /usr/lib, 124 need to have a "fake" dynamic lib in /usr/lib,
47 otherwise we run into linking problems. 125 otherwise we run into linking problems.
48 See bug #4411 on http://bugs.gentoo.org/ for 126 See bug #4411 on http://bugs.gentoo.org/ for
49 more info. */ 127 more info. */
50GROUP ( /lib/libxxx ) 128GROUP ( /$(get_libdir)/$1 )
51END_LDSCRIPT 129END_LDSCRIPT
52
53 dosed "s:libxxx:$1:" /usr/lib/$1
54
55 return 0
56} 130}
57 131
58# Simple function to draw a line consisting of '=' the same length as $* 132# Simple function to draw a line consisting of '=' the same length as $*
59# 133#
60# <azarah@gentoo.org> (11 Nov 2002) 134# <azarah@gentoo.org> (11 Nov 2002)
… …
144 local SINGLE_PATCH="no" 218 local SINGLE_PATCH="no"
145 local x="" 219 local x=""
146 220
147 if [ "$#" -gt 1 ] 221 if [ "$#" -gt 1 ]
148 then 222 then
149 eerror "Invalid arguments to epatch()" 223 local m=""
150 die "Invalid arguments to epatch()" 224 einfo "${#} patches to apply..."
225 for m in "$@" ; do
226 epatch "${m}"
227 done
228 return 0
151 fi 229 fi
152 230
153 if [ -n "$1" -a -f "$1" ] 231 if [ -n "$1" -a -f "$1" ]
154 then 232 then
155 SINGLE_PATCH="yes" 233 SINGLE_PATCH="yes"
… …
258 else 336 else
259 PATCH_TARGET="${x}" 337 PATCH_TARGET="${x}"
260 fi 338 fi
261 339
262 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 340 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
263 echo "patch ${popts} -p${count} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 341 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
264 342
265 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 343 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
266 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 344 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
267 345
268 if [ "${PATCH_SUFFIX}" != "patch" ] 346 if [ "${PATCH_SUFFIX}" != "patch" ]
… …
275 count=5 353 count=5
276 break 354 break
277 fi 355 fi
278 fi 356 fi
279 357
280 if (cat ${PATCH_TARGET} | patch ${popts} --dry-run -f -p${count}) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1 358 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1
281 then 359 then
282 draw_line "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 360 draw_line "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real
283 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 361 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real
284 echo "ACTUALLY APPLYING ${x##*/}..." >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 362 echo "ACTUALLY APPLYING ${x##*/}..." >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real
285 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 363 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real
286 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 364 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real
287 365
288 cat ${PATCH_TARGET} | patch ${popts} -p${count} >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 2>&1 366 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 2>&1
289 367
290 if [ "$?" -ne 0 ] 368 if [ "$?" -ne 0 ]
291 then 369 then
292 cat ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 370 cat ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
293 echo 371 echo
… …
336# This function return true if we are using the NPTL pthreads 414# This function return true if we are using the NPTL pthreads
337# implementation. 415# implementation.
338# 416#
339# <azarah@gentoo.org> (06 March 2003) 417# <azarah@gentoo.org> (06 March 2003)
340# 418#
341
342have_NPTL() { 419have_NPTL() {
343
344 cat > ${T}/test-nptl.c <<-"END" 420 cat > ${T}/test-nptl.c <<-"END"
345 #define _XOPEN_SOURCE 421 #define _XOPEN_SOURCE
346 #include <unistd.h> 422 #include <unistd.h>
347 #include <stdio.h> 423 #include <stdio.h>
348 424
… …
431 then 507 then
432 jobs="$((`grep -c ^processor /proc/cpuinfo` * 2))" 508 jobs="$((`grep -c ^processor /proc/cpuinfo` * 2))"
433 else 509 else
434 jobs=2 510 jobs=2
435 fi 511 fi
512 elif [ "${ARCH}" = "s390" ]
513 then
514 # s390 has "# processors : "
515 jobs="$((`grep "^\# processors" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
436 else 516 else
437 jobs="$((`grep -c ^cpu /proc/cpuinfo` * 2))" 517 jobs="$((`grep -c ^cpu /proc/cpuinfo` * 2))"
438 die "Unknown ARCH -- ${ARCH}!" 518 die "Unknown ARCH -- ${ARCH}!"
439 fi 519 fi
440 520
… …
456 fi 536 fi
457 fi 537 fi
458} 538}
459 539
460# Cheap replacement for when debianutils (and thus mktemp) 540# Cheap replacement for when debianutils (and thus mktemp)
461# do not exist on the users system 541# does not exist on the users system
462# vapier@gentoo.org 542# vapier@gentoo.org
463# 543#
464# Takes just 1 parameter (the directory to create tmpfile in) 544# Takes just 1 parameter (the directory to create tmpfile in)
465mymktemp() { 545mymktemp() {
466 local topdir="$1" 546 local topdir="$1"
467 547
468 [ -z "${topdir}" ] && topdir=/tmp 548 [ -z "${topdir}" ] && topdir=/tmp
469 if [ "`which mktemp 2>/dev/null`" ] 549 if [ "`which mktemp 2>/dev/null`" ]
470 then 550 then
471 mktemp -p ${topdir} 551 mktemp -p ${topdir}
472 else 552 else
473 local tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 553 local tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}"
474 touch ${tmp} 554 touch ${tmp}
475 echo ${tmp} 555 echo ${tmp}
556 fi
557}
558
559# Small wrapper for getent (Linux) and nidump (Mac OS X)
560# used in enewuser()/enewgroup()
561# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
562#
563# egetent(database, key)
564egetent() {
565 if use macos || use ppc-macos ; then
566 case "$2" in
567 *[!0-9]*) # Non numeric
568 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
569 ;;
570 *) # Numeric
571 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
572 ;;
573 esac
574 else
575 getent $1 $2
476 fi 576 fi
477} 577}
478 578
479# Simplify/standardize adding users to the system 579# Simplify/standardize adding users to the system
480# vapier@gentoo.org 580# vapier@gentoo.org
… …
496 then 596 then
497 eerror "No username specified !" 597 eerror "No username specified !"
498 die "Cannot call enewuser without a username" 598 die "Cannot call enewuser without a username"
499 fi 599 fi
500 600
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 601 # lets see if the username already exists
507 if [ "${euser}" == "${realuser}" ] 602 if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ]
508 then 603 then
509 return 0 604 return 0
510 fi 605 fi
511 einfo "Adding user '${euser}' to your system ..." 606 einfo "Adding user '${euser}' to your system ..."
512 607
… …
517 local euid="$1"; shift 612 local euid="$1"; shift
518 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] 613 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ]
519 then 614 then
520 if [ "${euid}" -gt 0 ] 615 if [ "${euid}" -gt 0 ]
521 then 616 then
522 opts="${opts} -u ${euid}" 617 if [ ! -z "`egetent passwd ${euid}`" ]
618 then
619 euid="next"
620 fi
523 else 621 else
524 eerror "Userid given but is not greater than 0 !" 622 eerror "Userid given but is not greater than 0 !"
525 die "${euid} is not a valid UID" 623 die "${euid} is not a valid UID"
526 fi 624 fi
527 else 625 else
528 euid="next available" 626 euid="next"
627 fi
628 if [ "${euid}" == "next" ]
629 then
630 local pwrange
631 if use macos || use ppc-macos ; then
632 pwrange="`jot 898 101`"
633 else
634 pwrange="`seq 101 999`"
529 fi 635 fi
636 for euid in ${pwrange} ; do
637 [ -z "`egetent passwd ${euid}`" ] && break
638 done
639 fi
640 opts="${opts} -u ${euid}"
530 einfo " - Userid: ${euid}" 641 einfo " - Userid: ${euid}"
531 642
532 # handle shell 643 # handle shell
533 local eshell="$1"; shift 644 local eshell="$1"; shift
534 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ] 645 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ]
… …
555 666
556 # handle groups 667 # handle groups
557 local egroups="$1"; shift 668 local egroups="$1"; shift
558 if [ ! -z "${egroups}" ] 669 if [ ! -z "${egroups}" ]
559 then 670 then
560 local realgroup=
561 local oldifs="${IFS}" 671 local oldifs="${IFS}"
562 export IFS="," 672 export IFS=","
563 for g in ${egroups} 673 for g in ${egroups}
564 do 674 do
565 chgrp ${g} ${tmpfile} >& /dev/null 675 if [ -z "`egetent group \"${g}\"`" ]
566 realgroup="`ls -l ${tmpfile} | awk '{print $4}'`"
567 if [ "${g}" != "${realgroup}" ]
568 then 676 then
569 eerror "You must add ${g} to the system first" 677 eerror "You must add group ${g} to the system first"
570 die "${g} is not a valid GID" 678 die "${g} is not a valid GID"
571 fi 679 fi
572 done 680 done
573 export IFS="${oldifs}" 681 export IFS="${oldifs}"
574 opts="${opts} -g ${egroups}" 682 opts="${opts} -g ${egroups}"
… …
579 687
580 # handle extra and add the user 688 # handle extra and add the user
581 local eextra="$@" 689 local eextra="$@"
582 local oldsandbox="${SANDBOX_ON}" 690 local oldsandbox="${SANDBOX_ON}"
583 export SANDBOX_ON="0" 691 export SANDBOX_ON="0"
692 if use macos || use ppc-macos ;
693 then
694 ### Make the user
584 if [ -z "${eextra}" ] 695 if [ -z "${eextra}" ]
585 then 696 then
697 dscl . create /users/${euser} uid ${euid}
698 dscl . create /users/${euser} shell ${eshell}
699 dscl . create /users/${euser} home ${ehome}
700 dscl . create /users/${euser} realname "added by portage for ${PN}"
701 ### Add the user to the groups specified
702 for g in ${egroups}
703 do
704 dscl . merge /groups/${g} users ${euser}
705 done
706 else
707 einfo "Extra options are not supported on macos yet"
708 einfo "Please report the ebuild along with the info below"
709 einfo "eextra: ${eextra}"
710 die "Required function missing"
711 fi
712 else
713 if [ -z "${eextra}" ]
714 then
586 useradd ${opts} ${euser} \ 715 useradd ${opts} ${euser} \
587 -c "added by portage for ${PN}" \ 716 -c "added by portage for ${PN}" \
588 || die "enewuser failed" 717 || die "enewuser failed"
589 else 718 else
590 einfo " - Extra: ${eextra}" 719 einfo " - Extra: ${eextra}"
591 useradd ${opts} ${euser} ${eextra} \ 720 useradd ${opts} ${euser} ${eextra} \
592 || die "enewuser failed" 721 || die "enewuser failed"
722 fi
593 fi 723 fi
594 export SANDBOX_ON="${oldsandbox}" 724 export SANDBOX_ON="${oldsandbox}"
595 725
596 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ] 726 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ]
597 then 727 then
… …
618 then 748 then
619 eerror "No group specified !" 749 eerror "No group specified !"
620 die "Cannot call enewgroup without a group" 750 die "Cannot call enewgroup without a group"
621 fi 751 fi
622 752
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 753 # see if group already exists
629 if [ "${egroup}" == "${realgroup}" ] 754 if [ "${egroup}" == "`egetent group \"${egroup}\" | cut -d: -f1`" ]
630 then 755 then
631 return 0 756 return 0
632 fi 757 fi
633 einfo "Adding group '${egroup}' to your system ..." 758 einfo "Adding group '${egroup}' to your system ..."
634 759
… …
639 local egid="$1"; shift 764 local egid="$1"; shift
640 if [ ! -z "${egid}" ] 765 if [ ! -z "${egid}" ]
641 then 766 then
642 if [ "${egid}" -gt 0 ] 767 if [ "${egid}" -gt 0 ]
643 then 768 then
769 if [ -z "`egetent group ${egid}`" ]
770 then
771 if use macos || use ppc-macos ; then
772 opts="${opts} ${egid}"
773 else
644 opts="${opts} -g ${egid}" 774 opts="${opts} -g ${egid}"
775 fi
776 else
777 egid="next available; requested gid taken"
778 fi
645 else 779 else
646 eerror "Groupid given but is not greater than 0 !" 780 eerror "Groupid given but is not greater than 0 !"
647 die "${egid} is not a valid GID" 781 die "${egid} is not a valid GID"
648 fi 782 fi
649 else 783 else
… …
656 opts="${opts} ${eextra}" 790 opts="${opts} ${eextra}"
657 791
658 # add the group 792 # add the group
659 local oldsandbox="${SANDBOX_ON}" 793 local oldsandbox="${SANDBOX_ON}"
660 export SANDBOX_ON="0" 794 export SANDBOX_ON="0"
795 if use macos || use ppc-macos ;
796 then
797 if [ ! -z "${eextra}" ];
798 then
799 einfo "Extra options are not supported on macos yet"
800 einfo "Please report the ebuild along with the info below"
801 einfo "eextra: ${eextra}"
802 die "Required function missing"
803 fi
804
805 # If we need the next available
806 case ${egid} in
807 *[!0-9]*) # Non numeric
808 for egid in `jot 898 101`; do
809 [ -z "`egetent group ${egid}`" ] && break
810 done
811 esac
812 dscl . create /groups/${egroup} gid ${egid}
813 dscl . create /groups/${egroup} passwd '*'
814 else
661 groupadd ${opts} ${egroup} || die "enewgroup failed" 815 groupadd ${opts} ${egroup} || die "enewgroup failed"
816 fi
662 export SANDBOX_ON="${oldsandbox}" 817 export SANDBOX_ON="${oldsandbox}"
663} 818}
664 819
665# Simple script to replace 'dos2unix' binaries 820# Simple script to replace 'dos2unix' binaries
666# vapier@gentoo.org 821# vapier@gentoo.org
… …
687# name: the name that will show up in the menu 842# name: the name that will show up in the menu
688# icon: give your little like a pretty little icon ... 843# icon: give your little like a pretty little icon ...
689# this can be relative (to /usr/share/pixmaps) or 844# this can be relative (to /usr/share/pixmaps) or
690# a full path to an icon 845# a full path to an icon
691# type: what kind of application is this ? for categories: 846# type: what kind of application is this ? for categories:
692# http://www.freedesktop.org/standards/menu/draft/menu-spec/menu-spec.html 847# http://www.freedesktop.org/standards/menu-spec/
693# path: if your app needs to startup in a specific dir 848# path: if your app needs to startup in a specific dir
694make_desktop_entry() { 849make_desktop_entry() {
695 [ -z "$1" ] && eerror "You must specify the executable" && return 1 850 [ -z "$1" ] && eerror "You must specify the executable" && return 1
696 851
697 local exec="${1}" 852 local exec="${1}"
698 local name="${2:-${PN}}" 853 local name="${2:-${PN}}"
699 local icon="${3:-${PN}.png}" 854 local icon="${3:-${PN}.png}"
700 local type="${4}" 855 local type="${4}"
856 local subdir="${6}"
701 local path="${5:-${GAMES_PREFIX}}" 857 local path="${5:-${GAMES_BINDIR}}"
702 if [ -z "${type}" ] 858 if [ -z "${type}" ]
703 then 859 then
704 case ${CATEGORY} in 860 case ${CATEGORY} in
705 "app-emulation") 861 "app-emulation")
706 type=Emulator 862 type=Emulator
863 subdir="Emulation"
707 ;; 864 ;;
708 "games-"*) 865 "games-"*)
709 type=Game 866 type=Game
867 subdir="Games"
710 ;; 868 ;;
711 "net-"*) 869 "net-"*)
712 type=Network; 870 type=Network
871 subdir="${type}"
713 ;; 872 ;;
714 *) 873 *)
715 type= 874 type=
875 subdir=
716 ;; 876 ;;
717 esac 877 esac
718 fi 878 fi
719 local desktop="${T}/${exec}.desktop" 879 local desktop="${T}/${exec}.desktop"
720 880
… …
725Type=Application 885Type=Application
726Comment=${DESCRIPTION} 886Comment=${DESCRIPTION}
727Exec=${exec} 887Exec=${exec}
728Path=${path} 888Path=${path}
729Icon=${icon} 889Icon=${icon}
730Categories=Application;${type};" > ${desktop} 890Categories=Application;${type};" > "${desktop}"
731 891
732 if [ -d "/usr/share/applications" ] 892 if [ -d "/usr/share/applications" ]
733 then 893 then
734 insinto /usr/share/applications 894 insinto /usr/share/applications
735 doins ${desktop} 895 doins "${desktop}"
736 fi 896 fi
737 897
738 #if [ -d "/usr/share/gnome/apps" ] 898 #if [ -d "/usr/share/gnome/apps" ]
739 #then 899 #then
740 # insinto /usr/share/gnome/apps/Games 900 # insinto /usr/share/gnome/apps/Games
… …
750 # done 910 # done
751 #fi 911 #fi
752 912
753 if [ -d "/usr/share/applnk" ] 913 if [ -d "/usr/share/applnk" ]
754 then 914 then
755 insinto /usr/share/applnk/${type} 915 insinto /usr/share/applnk/${subdir}
756 doins ${desktop} 916 doins "${desktop}"
757 fi 917 fi
758 918
759 return 0 919 return 0
760} 920}
761 921
… …
932 tail -n +${skip} ${src} | bzip2 -dc | tar --no-same-owner -xf - 1092 tail -n +${skip} ${src} | bzip2 -dc | tar --no-same-owner -xf -
933 ;; 1093 ;;
934 gzip*) 1094 gzip*)
935 tail -n +${skip} ${src} | tar --no-same-owner -xzf - 1095 tail -n +${skip} ${src} | tar --no-same-owner -xzf -
936 ;; 1096 ;;
1097 compress*)
1098 tail -n +${skip} ${src} | gunzip | tar --no-same-owner -xf -
1099 ;;
937 *) 1100 *)
1101 eerror "Unknown filetype \"${filetype}\" ?"
938 false 1102 false
939 ;; 1103 ;;
940 esac 1104 esac
941 assert "failure unpacking (${filetype}) makeself ${shrtsrc} ('${ver}' +${skip})" 1105 assert "failure unpacking (${filetype}) makeself ${shrtsrc} ('${ver}' +${skip})"
942} 1106}
… …
961 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1125 [ ! -f "${lic}" ] && die "Could not find requested license ${src}"
962 local l="`basename ${lic}`" 1126 local l="`basename ${lic}`"
963 1127
964 # here is where we check for the licenses the user already 1128 # here is where we check for the licenses the user already
965 # accepted ... if we don't find a match, we make the user accept 1129 # accepted ... if we don't find a match, we make the user accept
1130 local shopts=$-
966 local alic 1131 local alic
1132 set -o noglob #so that bash doesn't expand "*"
967 for alic in "${ACCEPT_LICENSE}" ; do 1133 for alic in ${ACCEPT_LICENSE} ; do
968 [ "${alic}" == "*" ] && return 0 1134 if [[ ${alic} == * || ${alic} == ${l} ]]; then
969 [ "${alic}" == "${l}" ] && return 0 1135 set +o noglob; set -${shopts} #reset old shell opts
1136 return 0
1137 fi
970 done 1138 done
1139 set +o noglob; set -$shopts #reset old shell opts
971 1140
972 local licmsg="`mymktemp ${T}`" 1141 local licmsg="`mymktemp ${T}`"
973 cat << EOF > ${licmsg} 1142 cat << EOF > ${licmsg}
974********************************************************** 1143**********************************************************
975The following license outlines the terms of use of this 1144The following license outlines the terms of use of this
… …
1100# remember, you can only go forward in the cd chain, you can't go back. 1269# remember, you can only go forward in the cd chain, you can't go back.
1101cdrom_load_next_cd() { 1270cdrom_load_next_cd() {
1102 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1)) 1271 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1103 local var= 1272 local var=
1104 1273
1274 if [ ! -z "${CD_ROOT}" ] ; then
1275 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1276 return
1277 fi
1278
1105 unset CDROM_ROOT 1279 unset CDROM_ROOT
1106 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1280 var=CDROM_ROOTS_${CDROM_CURRENT_CD}
1107 if [ -z "${!var}" ] ; then 1281 if [ -z "${!var}" ] ; then
1108 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1282 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1109 cdrom_locate_file_on_cd ${!var} 1283 cdrom_locate_file_on_cd ${!var}
… …
1157 einfo "or hit CTRL+C to abort the emerge." 1331 einfo "or hit CTRL+C to abort the emerge."
1158 read 1332 read
1159 fi 1333 fi
1160 done 1334 done
1161} 1335}
1336
1337# Make sure that LINGUAS only contains languages that
1338# a package can support
1339#
1340# usage: strip-linguas <allow LINGUAS>
1341# strip-linguas -i <directories of .po files>
1342# strip-linguas -u <directories of .po files>
1343#
1344# The first form allows you to specify a list of LINGUAS.
1345# The -i builds a list of po files found in all the
1346# directories and uses the intersection of the lists.
1347# The -u builds a list of po files found in all the
1348# directories and uses the union of the lists.
1349strip-linguas() {
1350 local ls newls
1351 if [ "$1" == "-i" ] || [ "$1" == "-u" ] ; then
1352 local op="$1"; shift
1353 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift
1354 local d f
1355 for d in "$@" ; do
1356 if [ "${op}" == "-u" ] ; then
1357 newls="${ls}"
1358 else
1359 newls=""
1360 fi
1361 for f in $(find "$d" -name '*.po' -printf '%f ') ; do
1362 if [ "${op}" == "-i" ] ; then
1363 [ "${ls/ ${f} /}" != "${ls}" ] && newls="${newls} ${f}"
1364 else
1365 [ "${ls/ ${f} /}" == "${ls}" ] && newls="${newls} ${f}"
1366 fi
1367 done
1368 ls="${newls}"
1369 done
1370 ls="${ls//.po}"
1371 else
1372 ls="$@"
1373 fi
1374
1375 ls=" ${ls} "
1376 newls=""
1377 for f in ${LINGUAS} ; do
1378 if [ "${ls/ ${f} /}" != "${ls}" ] ; then
1379 nl="${newls} ${f}"
1380 else
1381 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA"
1382 fi
1383 done
1384 if [ -z "${newls}" ] ; then
1385 unset LINGUAS
1386 else
1387 export LINGUAS="${newls}"
1388 fi
1389}
Legend:
Removed from v.1.78  
changed lines
  Added in v.1.106
  ViewVC Help
Powered by ViewVC 1.1.20