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

Diff of /eclass/eutils.eclass

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

Revision 1.76 Revision 1.98
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.76 2004/01/26 23:40:07 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.98 2004/09/05 22:38:41 ciaranm 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
422 jobs="$((`grep "^cpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))" 489 jobs="$((`grep "^cpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
423 else 490 else
424 jobs=2 491 jobs=2
425 fi 492 fi
426 493
427 elif [ "${ARCH}" = "ppc" ] 494 elif [ "${ARCH}" = "ppc" -o "${ARCH}" = "ppc64" ]
428 then 495 then
429 # ppc has "processor", but only when compiled with SMP 496 # ppc has "processor", but only when compiled with SMP
430 if [ "`grep -c "^processor" /proc/cpuinfo`" -eq 1 ] 497 if [ "`grep -c "^processor" /proc/cpuinfo`" -eq 1 ]
431 then 498 then
432 jobs="$((`grep -c ^processor /proc/cpuinfo` * 2))" 499 jobs="$((`grep -c ^processor /proc/cpuinfo` * 2))"
433 else 500 else
434 jobs=2 501 jobs=2
435 fi 502 fi
503 elif [ "${ARCH}" = "s390" ]
504 then
505 # s390 has "# processors : "
506 jobs="$((`grep "^\# processors" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
436 else 507 else
437 jobs="$((`grep -c ^cpu /proc/cpuinfo` * 2))" 508 jobs="$((`grep -c ^cpu /proc/cpuinfo` * 2))"
438 die "Unknown ARCH -- ${ARCH}!" 509 die "Unknown ARCH -- ${ARCH}!"
439 fi 510 fi
440 511
456 fi 527 fi
457 fi 528 fi
458} 529}
459 530
460# Cheap replacement for when debianutils (and thus mktemp) 531# Cheap replacement for when debianutils (and thus mktemp)
461# do not exist on the users system 532# does not exist on the users system
462# vapier@gentoo.org 533# vapier@gentoo.org
463# 534#
464# Takes just 1 parameter (the directory to create tmpfile in) 535# Takes just 1 parameter (the directory to create tmpfile in)
465mymktemp() { 536mymktemp() {
466 local topdir="$1" 537 local topdir="$1"
471 mktemp -p ${topdir} 542 mktemp -p ${topdir}
472 else 543 else
473 local tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 544 local tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}"
474 touch ${tmp} 545 touch ${tmp}
475 echo ${tmp} 546 echo ${tmp}
547 fi
548}
549
550# Small wrapper for getent (Linux) and nidump (Mac OS X)
551# used in enewuser()/enewgroup()
552# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
553#
554# egetent(database, key)
555egetent() {
556 if [ "${ARCH}" == "macos" ] ; then
557 case "$2" in
558 *[!0-9]*) # Non numeric
559 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
560 ;;
561 *) # Numeric
562 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
563 ;;
564 esac
565 else
566 getent $1 $2
476 fi 567 fi
477} 568}
478 569
479# Simplify/standardize adding users to the system 570# Simplify/standardize adding users to the system
480# vapier@gentoo.org 571# vapier@gentoo.org
496 then 587 then
497 eerror "No username specified !" 588 eerror "No username specified !"
498 die "Cannot call enewuser without a username" 589 die "Cannot call enewuser without a username"
499 fi 590 fi
500 591
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 592 # lets see if the username already exists
507 if [ "${euser}" == "${realuser}" ] 593 if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ]
508 then 594 then
509 return 0 595 return 0
510 fi 596 fi
511 einfo "Adding user '${euser}' to your system ..." 597 einfo "Adding user '${euser}' to your system ..."
512 598
517 local euid="$1"; shift 603 local euid="$1"; shift
518 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] 604 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ]
519 then 605 then
520 if [ "${euid}" -gt 0 ] 606 if [ "${euid}" -gt 0 ]
521 then 607 then
522 opts="${opts} -u ${euid}" 608 if [ ! -z "`egetent passwd ${euid}`" ]
609 then
610 euid="next"
611 fi
523 else 612 else
524 eerror "Userid given but is not greater than 0 !" 613 eerror "Userid given but is not greater than 0 !"
525 die "${euid} is not a valid UID" 614 die "${euid} is not a valid UID"
526 fi 615 fi
527 else 616 else
528 euid="next available" 617 euid="next"
618 fi
619 if [ "${euid}" == "next" ]
620 then
621 local pwrange
622 if [ "${ARCH}" == "macos" ] ; then
623 pwrange="`jot 898 101`"
624 else
625 pwrange="`seq 101 999`"
529 fi 626 fi
627 for euid in ${pwrange} ; do
628 [ -z "`egetent passwd ${euid}`" ] && break
629 done
630 fi
631 opts="${opts} -u ${euid}"
530 einfo " - Userid: ${euid}" 632 einfo " - Userid: ${euid}"
531 633
532 # handle shell 634 # handle shell
533 local eshell="$1"; shift 635 local eshell="$1"; shift
534 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ] 636 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ]
555 657
556 # handle groups 658 # handle groups
557 local egroups="$1"; shift 659 local egroups="$1"; shift
558 if [ ! -z "${egroups}" ] 660 if [ ! -z "${egroups}" ]
559 then 661 then
560 local realgroup=
561 local oldifs="${IFS}" 662 local oldifs="${IFS}"
562 export IFS="," 663 export IFS=","
563 for g in ${egroups} 664 for g in ${egroups}
564 do 665 do
565 chgrp ${g} ${tmpfile} >& /dev/null 666 if [ -z "`egetent group \"${g}\"`" ]
566 realgroup="`ls -l ${tmpfile} | awk '{print $4}'`"
567 if [ "${g}" != "${realgroup}" ]
568 then 667 then
569 eerror "You must add ${g} to the system first" 668 eerror "You must add group ${g} to the system first"
570 die "${g} is not a valid GID" 669 die "${g} is not a valid GID"
571 fi 670 fi
572 done 671 done
573 export IFS="${oldifs}" 672 export IFS="${oldifs}"
574 opts="${opts} -g ${egroups}" 673 opts="${opts} -g ${egroups}"
579 678
580 # handle extra and add the user 679 # handle extra and add the user
581 local eextra="$@" 680 local eextra="$@"
582 local oldsandbox="${SANDBOX_ON}" 681 local oldsandbox="${SANDBOX_ON}"
583 export SANDBOX_ON="0" 682 export SANDBOX_ON="0"
683 if [ "${ARCH}" == "macos" ];
684 then
685 ### Make the user
584 if [ -z "${eextra}" ] 686 if [ -z "${eextra}" ]
585 then 687 then
688 dscl . create /users/${euser} uid ${euid}
689 dscl . create /users/${euser} shell ${eshell}
690 dscl . create /users/${euser} home ${ehome}
691 dscl . create /users/${euser} realname "added by portage for ${PN}"
692 ### Add the user to the groups specified
693 for g in ${egroups}
694 do
695 dscl . merge /groups/${g} users ${euser}
696 done
697 else
698 einfo "Extra options are not supported on macos yet"
699 einfo "Please report the ebuild along with the info below"
700 einfo "eextra: ${eextra}"
701 die "Required function missing"
702 fi
703 else
704 if [ -z "${eextra}" ]
705 then
586 useradd ${opts} ${euser} \ 706 useradd ${opts} ${euser} \
587 -c "added by portage for ${PN}" \ 707 -c "added by portage for ${PN}" \
588 || die "enewuser failed" 708 || die "enewuser failed"
589 else 709 else
590 einfo " - Extra: ${eextra}" 710 einfo " - Extra: ${eextra}"
591 useradd ${opts} ${euser} ${eextra} \ 711 useradd ${opts} ${euser} ${eextra} \
592 || die "enewuser failed" 712 || die "enewuser failed"
713 fi
593 fi 714 fi
594 export SANDBOX_ON="${oldsandbox}" 715 export SANDBOX_ON="${oldsandbox}"
595 716
596 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ] 717 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ]
597 then 718 then
618 then 739 then
619 eerror "No group specified !" 740 eerror "No group specified !"
620 die "Cannot call enewgroup without a group" 741 die "Cannot call enewgroup without a group"
621 fi 742 fi
622 743
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 744 # see if group already exists
629 if [ "${egroup}" == "${realgroup}" ] 745 if [ "${egroup}" == "`egetent group \"${egroup}\" | cut -d: -f1`" ]
630 then 746 then
631 return 0 747 return 0
632 fi 748 fi
633 einfo "Adding group '${egroup}' to your system ..." 749 einfo "Adding group '${egroup}' to your system ..."
634 750
639 local egid="$1"; shift 755 local egid="$1"; shift
640 if [ ! -z "${egid}" ] 756 if [ ! -z "${egid}" ]
641 then 757 then
642 if [ "${egid}" -gt 0 ] 758 if [ "${egid}" -gt 0 ]
643 then 759 then
760 if [ -z "`egetent group ${egid}`" ]
761 then
762 if [ "${ARCH}" == "macos" ] ; then
763 opts="${opts} ${egid}"
764 else
644 opts="${opts} -g ${egid}" 765 opts="${opts} -g ${egid}"
766 fi
767 else
768 egid="next available; requested gid taken"
769 fi
645 else 770 else
646 eerror "Groupid given but is not greater than 0 !" 771 eerror "Groupid given but is not greater than 0 !"
647 die "${egid} is not a valid GID" 772 die "${egid} is not a valid GID"
648 fi 773 fi
649 else 774 else
656 opts="${opts} ${eextra}" 781 opts="${opts} ${eextra}"
657 782
658 # add the group 783 # add the group
659 local oldsandbox="${SANDBOX_ON}" 784 local oldsandbox="${SANDBOX_ON}"
660 export SANDBOX_ON="0" 785 export SANDBOX_ON="0"
786 if [ "${ARCH}" == "macos" ];
787 then
788 if [ ! -z "${eextra}" ];
789 then
790 einfo "Extra options are not supported on macos yet"
791 einfo "Please report the ebuild along with the info below"
792 einfo "eextra: ${eextra}"
793 die "Required function missing"
794 fi
795
796 # If we need the next available
797 case ${egid} in
798 *[!0-9]*) # Non numeric
799 for egid in `jot 898 101`; do
800 [ -z "`egetent group ${egid}`" ] && break
801 done
802 esac
803 dscl . create /groups/${egroup} gid ${egid}
804 dscl . create /groups/${egroup} passwd '*'
805 else
661 groupadd ${opts} ${egroup} || die "enewgroup failed" 806 groupadd ${opts} ${egroup} || die "enewgroup failed"
807 fi
662 export SANDBOX_ON="${oldsandbox}" 808 export SANDBOX_ON="${oldsandbox}"
663} 809}
664 810
665# Simple script to replace 'dos2unix' binaries 811# Simple script to replace 'dos2unix' binaries
666# vapier@gentoo.org 812# vapier@gentoo.org
687# name: the name that will show up in the menu 833# name: the name that will show up in the menu
688# icon: give your little like a pretty little icon ... 834# icon: give your little like a pretty little icon ...
689# this can be relative (to /usr/share/pixmaps) or 835# this can be relative (to /usr/share/pixmaps) or
690# a full path to an icon 836# a full path to an icon
691# type: what kind of application is this ? for categories: 837# type: what kind of application is this ? for categories:
692# http://www.freedesktop.org/standards/menu/draft/menu-spec/menu-spec.html 838# http://www.freedesktop.org/standards/menu-spec/
693# path: if your app needs to startup in a specific dir 839# path: if your app needs to startup in a specific dir
694make_desktop_entry() { 840make_desktop_entry() {
695 [ -z "$1" ] && eerror "You must specify the executable" && return 1 841 [ -z "$1" ] && eerror "You must specify the executable" && return 1
696 842
697 local exec="${1}" 843 local exec="${1}"
698 local name="${2:-${PN}}" 844 local name="${2:-${PN}}"
699 local icon="${3:-${PN}.png}" 845 local icon="${3:-${PN}.png}"
700 local type="${4}" 846 local type="${4}"
847 local subdir="${6}"
701 local path="${5:-${GAMES_PREFIX}}" 848 local path="${5:-${GAMES_PREFIX}}"
702 if [ -z "${type}" ] 849 if [ -z "${type}" ]
703 then 850 then
704 case ${CATEGORY} in 851 case ${CATEGORY} in
705 "app-emulation") 852 "app-emulation")
706 type=Emulator 853 type=Emulator
854 subdir="Emulation"
707 ;; 855 ;;
708 "games-"*) 856 "games-"*)
709 type=Game 857 type=Game
858 subdir="Games"
710 ;; 859 ;;
711 "net-"*) 860 "net-"*)
712 type=Network; 861 type=Network
862 subdir="${type}"
713 ;; 863 ;;
714 *) 864 *)
715 type= 865 type=
866 subdir=
716 ;; 867 ;;
717 esac 868 esac
718 fi 869 fi
719 local desktop="${T}/${exec}.desktop" 870 local desktop="${T}/${exec}.desktop"
720 871
750 # done 901 # done
751 #fi 902 #fi
752 903
753 if [ -d "/usr/share/applnk" ] 904 if [ -d "/usr/share/applnk" ]
754 then 905 then
755 insinto /usr/share/applnk/${type} 906 insinto /usr/share/applnk/${subdir}
756 doins ${desktop} 907 doins ${desktop}
757 fi 908 fi
758 909
759 return 0 910 return 0
760}
761
762# new convenience patch wrapper function to eventually replace epatch(),
763# $PATCHES, $PATCHES1, src_unpack:patch, src_unpack:autopatch and
764# /usr/bin/patch
765# Features:
766# - bulk patch handling similar to epatch()'s
767# - automatic patch level detection like epatch()'s
768# - automatic patch uncompression like epatch()'s
769# - doesn't have the --dry-run overhead of epatch() - inspects patchfiles
770# manually instead
771# - once I decide it's production-ready, it'll be called from base_src_unpack
772# to handle $PATCHES to avoid defining src_unpack just to use xpatch
773
774# accepts zero or more parameters specifying patchfiles and/or patchdirs
775
776# known issues:
777# - only supports unified style patches (does anyone _really_ use anything
778# else?)
779# - because it doesn't use --dry-run there is a risk of it failing
780# to find the files to patch, ie detect the patchlevel, properly. It doesn't use
781# any of the backup heuristics that patch employs to discover a filename.
782# however, this isn't dangerous because if it works for the developer who's
783# writing the ebuild, it'll always work for the users, and if it doesn't,
784# then we'll fix it :-)
785# - no support as yet for patches applying outside $S (and not directly in $WORKDIR).
786xpatch() {
787
788 debug-print-function ${FUNCNAME} $*
789
790 local list=
791 local list2=
792 declare -i plevel
793
794 # parse patch sources
795 for x in $*
796 do
797 debug-print "${FUNCNAME}: parsing parameter ${x}"
798 if [ -f "${x}" ]
799 then
800 list="${list} ${x}"
801 elif [ -d "${x}" ]
802 then
803 # handles patchdirs like epatch() for now: no recursion.
804 # patches are sorted by filename, so with an xy_foo naming scheme you'll get the right order.
805 # only patches with _$ARCH_ or _all_ in their filenames are applied.
806 for file in `ls -A ${x}`
807 do
808 debug-print "${FUNCNAME}: parsing in subdir: file ${file}"
809 if [ -f "${x}/${file}" -a "${file}" != "${file/_all_}" -o \
810 "${file}" != "${file/_$ARCH_}" ]
811 then
812 list2="${list2} ${x}/${file}"
813 fi
814 done
815 list="`echo ${list2} | sort` ${list}"
816 else
817 die "Couldn't find ${x}"
818 fi
819 done
820
821 debug-print "${FUNCNAME}: final list of patches: ${list}"
822
823 for x in ${list};
824 do
825 debug-print "${FUNCNAME}: processing ${x}"
826 # deal with compressed files. /usr/bin/file is in the system profile, or should be.
827 case "`/usr/bin/file -b ${x}`" in
828 *gzip*)
829 patchfile="${T}/current.patch"
830 ungzip -c "${x}" > "${patchfile}"
831 ;;
832 *bzip2*)
833 patchfile="${T}/current.patch"
834 bunzip2 -c "${x}" > "${patchfile}"
835 ;;
836 *text*)
837 patchfile="${x}"
838 ;;
839 *)
840 die "Could not determine filetype of patch ${x}"
841 ;;
842 esac
843 debug-print "${FUNCNAME}: patchfile=${patchfile}"
844
845 # determine patchlevel. supports p0 and higher with either $S or $WORKDIR as base.
846 target="`/bin/grep -m 1 '^+++ ' ${patchfile}`"
847 debug-print "${FUNCNAME}: raw target=${target}"
848 # strip target down to the path/filename, remove leading +++
849 target="${target/+++ }"; target="${target%% *}"
850 # duplicate slashes are discarded by patch wrt the patchlevel. therefore we need
851 # to discard them as well to calculate the correct patchlevel.
852 target="${target//\/\//\/}"
853 debug-print "${FUNCNAME}: stripped target=${target}"
854
855 # look for target
856 for basedir in "${S}" "${WORKDIR}" "${PWD}"; do
857 debug-print "${FUNCNAME}: looking in basedir=${basedir}"
858 cd "${basedir}"
859
860 # try stripping leading directories
861 target2="${target}"
862 plevel=0
863 debug-print "${FUNCNAME}: trying target2=${target2}, plevel=${plevel}"
864 while [ ! -f "${target2}" ]
865 do
866 target2="${target2#*/}" # removes piece of target2 upto the first occurence of /
867 plevel=$((plevel+1))
868 debug-print "${FUNCNAME}: trying target2=${target2}, plevel=${plevel}"
869 [ "${target2}" == "${target2/\/}" ] && break
870 done
871 test -f "${target2}" && break
872
873 # try stripping filename - needed to support patches creating new files
874 target2="${target%/*}"
875 plevel=0
876 debug-print "${FUNCNAME}: trying target2=${target2}, plevel=${plevel}"
877 while [ ! -d "${target2}" ]
878 do
879 target2="${target2#*/}" # removes piece of target2 upto the first occurence of /
880 plevel=$((plevel+1))
881 debug-print "${FUNCNAME}: trying target2=${target2}, plevel=${plevel}"
882 [ "${target2}" == "${target2/\/}" ] && break
883 done
884 test -d "${target2}" && break
885
886 done
887
888 test -f "${basedir}/${target2}" || test -d "${basedir}/${target2}" \
889 || die "Could not determine patchlevel for ${x}"
890 debug-print "${FUNCNAME}: determined plevel=${plevel}"
891 # do the patching
892 ebegin "Applying patch ${x##*/}..."
893 /usr/bin/patch -p${plevel} < "${patchfile}" > /dev/null \
894 || die "Failed to apply patch ${x}"
895 eend $?
896
897 done
898
899} 911}
900 912
901# for internal use only (unpack_pdv and unpack_makeself) 913# for internal use only (unpack_pdv and unpack_makeself)
902find_unpackable_file() { 914find_unpackable_file() {
903 local src="$1" 915 local src="$1"
1071 tail -n +${skip} ${src} | bzip2 -dc | tar --no-same-owner -xf - 1083 tail -n +${skip} ${src} | bzip2 -dc | tar --no-same-owner -xf -
1072 ;; 1084 ;;
1073 gzip*) 1085 gzip*)
1074 tail -n +${skip} ${src} | tar --no-same-owner -xzf - 1086 tail -n +${skip} ${src} | tar --no-same-owner -xzf -
1075 ;; 1087 ;;
1088 compress*)
1089 tail -n +${skip} ${src} | gunzip | tar --no-same-owner -xf -
1090 ;;
1076 *) 1091 *)
1092 eerror "Unknown filetype \"${filetype}\" ?"
1077 false 1093 false
1078 ;; 1094 ;;
1079 esac 1095 esac
1080 assert "failure unpacking (${filetype}) makeself ${shrtsrc} ('${ver}' +${skip})" 1096 assert "failure unpacking (${filetype}) makeself ${shrtsrc} ('${ver}' +${skip})"
1081} 1097}
1239# remember, you can only go forward in the cd chain, you can't go back. 1255# remember, you can only go forward in the cd chain, you can't go back.
1240cdrom_load_next_cd() { 1256cdrom_load_next_cd() {
1241 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1)) 1257 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1242 local var= 1258 local var=
1243 1259
1260 if [ ! -z "${CD_ROOT}" ] ; then
1261 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1262 return
1263 fi
1264
1244 unset CDROM_ROOT 1265 unset CDROM_ROOT
1245 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1266 var=CDROM_ROOTS_${CDROM_CURRENT_CD}
1246 if [ -z "${!var}" ] ; then 1267 if [ -z "${!var}" ] ; then
1247 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1268 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1248 cdrom_locate_file_on_cd ${!var} 1269 cdrom_locate_file_on_cd ${!var}
1296 einfo "or hit CTRL+C to abort the emerge." 1317 einfo "or hit CTRL+C to abort the emerge."
1297 read 1318 read
1298 fi 1319 fi
1299 done 1320 done
1300} 1321}
1322
1323# Make sure that LINGUAS only contains languages that
1324# a package can support
1325#
1326# usage: strip-linguas <allow LINGUAS>
1327# strip-linguas -i <directories of .po files>
1328# strip-linguas -u <directories of .po files>
1329#
1330# The first form allows you to specify a list of LINGUAS.
1331# The -i builds a list of po files found in all the
1332# directories and uses the intersection of the lists.
1333# The -u builds a list of po files found in all the
1334# directories and uses the union of the lists.
1335strip-linguas() {
1336 local ls newls
1337 if [ "$1" == "-i" ] || [ "$1" == "-u" ] ; then
1338 local op="$1"; shift
1339 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift
1340 local d f
1341 for d in "$@" ; do
1342 if [ "${op}" == "-u" ] ; then
1343 newls="${ls}"
1344 else
1345 newls=""
1346 fi
1347 for f in $(find "$d" -name '*.po' -printf '%f ') ; do
1348 if [ "${op}" == "-i" ] ; then
1349 [ "${ls/ ${f} /}" != "${ls}" ] && newls="${newls} ${f}"
1350 else
1351 [ "${ls/ ${f} /}" == "${ls}" ] && newls="${newls} ${f}"
1352 fi
1353 done
1354 ls="${newls}"
1355 done
1356 ls="${ls//.po}"
1357 else
1358 ls="$@"
1359 fi
1360
1361 ls=" ${ls} "
1362 newls=""
1363 for f in ${LINGUAS} ; do
1364 if [ "${ls/ ${f} /}" != "${ls}" ] ; then
1365 nl="${newls} ${f}"
1366 else
1367 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA"
1368 fi
1369 done
1370 if [ -z "${newls}" ] ; then
1371 unset LINGUAS
1372 else
1373 export LINGUAS="${newls}"
1374 fi
1375}

Legend:
Removed from v.1.76  
changed lines
  Added in v.1.98

  ViewVC Help
Powered by ViewVC 1.1.20