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

Diff of /eclass/eutils.eclass

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

Revision 1.73 Revision 1.97
1# Copyright 1999-2003 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.73 2003/12/01 20:13:00 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.97 2004/08/31 09:05:24 lv 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# This function simply returns the desired lib directory. With portage
20# 2.0.51, we now have support for installing libraries to lib32/lib64
21# to accomidate the needs of multilib systems. It's no longer a good idea
22# to assume all libraries will end up in lib. Replace any (sane) instances
23# where lib is named directly with $(get_libdir) if possible.
24#
25# Travis Tilley <lv@gentoo.org> (24 Aug 2004)
26get_libdir() {
27 if [ ! -z "${CONF_LIBDIR_OVERRIDE}" ] ; then
28 # if there is an override, we want to use that... always.
29 CONF_LIBDIR="${CONF_LIBDIR_OVERRIDE}"
30 elif portageq has_version / '<sys-apps/portage-2.0.51_pre20' ; then
31 # and if there isnt an override, and we're using a version of
32 # portage without CONF_LIBDIR support, force the use of lib. dolib
33 # and friends from portage 2.0.50 wont be too happy otherwise.
34 CONF_LIBDIR="lib"
35 fi
36 # and of course, default to lib if CONF_LIBDIR isnt set
37 echo ${CONF_LIBDIR:=lib}
38}
39
40# Sometimes you need to override the value returned by get_libdir. A good
41# example of this is xorg-x11, where lib32 isnt a supported configuration,
42# and where lib64 -must- be used on amd64 (for applications that need lib
43# to be 32bit, such as adobe acrobat). Note that this override also bypasses
44# portage version sanity checking.
45# get_libdir_override expects one argument, the result get_libdir should
46# return:
47#
48# get_libdir_override lib64
49#
50# Travis Tilley <lv@gentoo.org> (31 Aug 2004)
51get_libdir_override() {
52 CONF_LIBDIR="$1"
53 CONF_LIBDIR_OVERRIDE="$1"
54}
18 55
19# This function generate linker scripts in /usr/lib for dynamic 56# This function generate linker scripts in /usr/lib for dynamic
20# libs in /lib. This is to fix linking problems when you have 57# 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 58# 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 59# in some cases when linking dynamic, the .a in /usr/lib is used
… …
33# to point to the latest version of the library present. 70# to point to the latest version of the library present.
34# 71#
35# <azarah@gentoo.org> (26 Oct 2002) 72# <azarah@gentoo.org> (26 Oct 2002)
36# 73#
37gen_usr_ldscript() { 74gen_usr_ldscript() {
38
39 # Just make sure it exists 75 # Just make sure it exists
40 dodir /usr/lib 76 dodir /usr/$(get_libdir)
41 77
42 cat > ${D}/usr/lib/$1 <<"END_LDSCRIPT" 78 cat > ${D}/usr/$(get_libdir)/$1 <<"END_LDSCRIPT"
43/* GNU ld script 79/* GNU ld script
44 Because Gentoo have critical dynamic libraries 80 Because Gentoo have critical dynamic libraries
45 in /lib, and the static versions in /usr/lib, we 81 in /lib, and the static versions in /usr/lib, we
46 need to have a "fake" dynamic lib in /usr/lib, 82 need to have a "fake" dynamic lib in /usr/lib,
47 otherwise we run into linking problems. 83 otherwise we run into linking problems.
48 See bug #4411 on http://bugs.gentoo.org/ for 84 See bug #4411 on http://bugs.gentoo.org/ for
49 more info. */ 85 more info. */
50GROUP ( /lib/libxxx )
51END_LDSCRIPT 86END_LDSCRIPT
52 87
88 echo "GROUP ( /$(get_libdir)/libxxx )" >> ${D}/usr/$(get_libdir)/$1
53 dosed "s:libxxx:$1:" /usr/lib/$1 89 dosed "s:libxxx:$1:" /usr/$(get_libdir)/$1
54 90
55 return 0 91 return 0
56} 92}
57 93
58# Simple function to draw a line consisting of '=' the same length as $* 94# Simple function to draw a line consisting of '=' the same length as $*
… …
144 local SINGLE_PATCH="no" 180 local SINGLE_PATCH="no"
145 local x="" 181 local x=""
146 182
147 if [ "$#" -gt 1 ] 183 if [ "$#" -gt 1 ]
148 then 184 then
149 eerror "Invalid arguments to epatch()" 185 local m=""
150 die "Invalid arguments to epatch()" 186 einfo "${#} patches to apply..."
187 for m in "$@" ; do
188 epatch "${m}"
189 done
190 return 0
151 fi 191 fi
152 192
153 if [ -n "$1" -a -f "$1" ] 193 if [ -n "$1" -a -f "$1" ]
154 then 194 then
155 SINGLE_PATCH="yes" 195 SINGLE_PATCH="yes"
… …
258 else 298 else
259 PATCH_TARGET="${x}" 299 PATCH_TARGET="${x}"
260 fi 300 fi
261 301
262 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 302 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
263 echo "patch ${popts} -p${count} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 303 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
264 304
265 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 305 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
266 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 306 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
267 307
268 if [ "${PATCH_SUFFIX}" != "patch" ] 308 if [ "${PATCH_SUFFIX}" != "patch" ]
… …
275 count=5 315 count=5
276 break 316 break
277 fi 317 fi
278 fi 318 fi
279 319
280 if (cat ${PATCH_TARGET} | patch ${popts} --dry-run -f -p${count}) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1 320 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1
281 then 321 then
282 draw_line "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 322 draw_line "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real
283 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 323 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real
284 echo "ACTUALLY APPLYING ${x##*/}..." >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 324 echo "ACTUALLY APPLYING ${x##*/}..." >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real
285 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 325 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real
286 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 326 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real
287 327
288 cat ${PATCH_TARGET} | patch ${popts} -p${count} >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 2>&1 328 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 2>&1
289 329
290 if [ "$?" -ne 0 ] 330 if [ "$?" -ne 0 ]
291 then 331 then
292 cat ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 332 cat ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
293 echo 333 echo
… …
422 jobs="$((`grep "^cpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))" 462 jobs="$((`grep "^cpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
423 else 463 else
424 jobs=2 464 jobs=2
425 fi 465 fi
426 466
427 elif [ "${ARCH}" = "ppc" ] 467 elif [ "${ARCH}" = "ppc" -o "${ARCH}" = "ppc64" ]
428 then 468 then
429 # ppc has "processor", but only when compiled with SMP 469 # ppc has "processor", but only when compiled with SMP
430 if [ "`grep -c "^processor" /proc/cpuinfo`" -eq 1 ] 470 if [ "`grep -c "^processor" /proc/cpuinfo`" -eq 1 ]
431 then 471 then
432 jobs="$((`grep -c ^processor /proc/cpuinfo` * 2))" 472 jobs="$((`grep -c ^processor /proc/cpuinfo` * 2))"
433 else 473 else
434 jobs=2 474 jobs=2
435 fi 475 fi
476 elif [ "${ARCH}" = "s390" ]
477 then
478 # s390 has "# processors : "
479 jobs="$((`grep "^\# processors" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
436 else 480 else
437 jobs="$((`grep -c ^cpu /proc/cpuinfo` * 2))" 481 jobs="$((`grep -c ^cpu /proc/cpuinfo` * 2))"
438 die "Unknown ARCH -- ${ARCH}!" 482 die "Unknown ARCH -- ${ARCH}!"
439 fi 483 fi
440 484
… …
456 fi 500 fi
457 fi 501 fi
458} 502}
459 503
460# Cheap replacement for when debianutils (and thus mktemp) 504# Cheap replacement for when debianutils (and thus mktemp)
461# do not exist on the users system 505# does not exist on the users system
462# vapier@gentoo.org 506# vapier@gentoo.org
463# 507#
464# Takes just 1 parameter (the directory to create tmpfile in) 508# Takes just 1 parameter (the directory to create tmpfile in)
465mymktemp() { 509mymktemp() {
466 local topdir="$1" 510 local topdir="$1"
… …
471 mktemp -p ${topdir} 515 mktemp -p ${topdir}
472 else 516 else
473 local tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 517 local tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}"
474 touch ${tmp} 518 touch ${tmp}
475 echo ${tmp} 519 echo ${tmp}
520 fi
521}
522
523# Small wrapper for getent (Linux) and nidump (Mac OS X)
524# used in enewuser()/enewgroup()
525# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
526#
527# egetent(database, key)
528egetent() {
529 if [ "${ARCH}" == "macos" ] ; then
530 case "$2" in
531 *[!0-9]*) # Non numeric
532 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
533 ;;
534 *) # Numeric
535 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
536 ;;
537 esac
538 else
539 getent $1 $2
476 fi 540 fi
477} 541}
478 542
479# Simplify/standardize adding users to the system 543# Simplify/standardize adding users to the system
480# vapier@gentoo.org 544# vapier@gentoo.org
… …
496 then 560 then
497 eerror "No username specified !" 561 eerror "No username specified !"
498 die "Cannot call enewuser without a username" 562 die "Cannot call enewuser without a username"
499 fi 563 fi
500 564
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 565 # lets see if the username already exists
507 if [ "${euser}" == "${realuser}" ] 566 if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ]
508 then 567 then
509 return 0 568 return 0
510 fi 569 fi
511 einfo "Adding user '${euser}' to your system ..." 570 einfo "Adding user '${euser}' to your system ..."
512 571
… …
517 local euid="$1"; shift 576 local euid="$1"; shift
518 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] 577 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ]
519 then 578 then
520 if [ "${euid}" -gt 0 ] 579 if [ "${euid}" -gt 0 ]
521 then 580 then
522 opts="${opts} -u ${euid}" 581 if [ ! -z "`egetent passwd ${euid}`" ]
582 then
583 euid="next"
584 fi
523 else 585 else
524 eerror "Userid given but is not greater than 0 !" 586 eerror "Userid given but is not greater than 0 !"
525 die "${euid} is not a valid UID" 587 die "${euid} is not a valid UID"
526 fi 588 fi
527 else 589 else
528 euid="next available" 590 euid="next"
591 fi
592 if [ "${euid}" == "next" ]
593 then
594 local pwrange
595 if [ "${ARCH}" == "macos" ] ; then
596 pwrange="`jot 898 101`"
597 else
598 pwrange="`seq 101 999`"
529 fi 599 fi
600 for euid in ${pwrange} ; do
601 [ -z "`egetent passwd ${euid}`" ] && break
602 done
603 fi
604 opts="${opts} -u ${euid}"
530 einfo " - Userid: ${euid}" 605 einfo " - Userid: ${euid}"
531 606
532 # handle shell 607 # handle shell
533 local eshell="$1"; shift 608 local eshell="$1"; shift
534 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ] 609 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ]
… …
555 630
556 # handle groups 631 # handle groups
557 local egroups="$1"; shift 632 local egroups="$1"; shift
558 if [ ! -z "${egroups}" ] 633 if [ ! -z "${egroups}" ]
559 then 634 then
560 local realgroup=
561 local oldifs="${IFS}" 635 local oldifs="${IFS}"
562 export IFS="," 636 export IFS=","
563 for g in ${egroups} 637 for g in ${egroups}
564 do 638 do
565 chgrp ${g} ${tmpfile} >& /dev/null 639 if [ -z "`egetent group \"${g}\"`" ]
566 realgroup="`ls -l ${tmpfile} | awk '{print $4}'`"
567 if [ "${g}" != "${realgroup}" ]
568 then 640 then
569 eerror "You must add ${g} to the system first" 641 eerror "You must add group ${g} to the system first"
570 die "${g} is not a valid GID" 642 die "${g} is not a valid GID"
571 fi 643 fi
572 done 644 done
573 export IFS="${oldifs}" 645 export IFS="${oldifs}"
574 opts="${opts} -g ${egroups}" 646 opts="${opts} -g ${egroups}"
… …
579 651
580 # handle extra and add the user 652 # handle extra and add the user
581 local eextra="$@" 653 local eextra="$@"
582 local oldsandbox="${SANDBOX_ON}" 654 local oldsandbox="${SANDBOX_ON}"
583 export SANDBOX_ON="0" 655 export SANDBOX_ON="0"
656 if [ "${ARCH}" == "macos" ];
657 then
658 ### Make the user
584 if [ -z "${eextra}" ] 659 if [ -z "${eextra}" ]
585 then 660 then
661 dscl . create /users/${euser} uid ${euid}
662 dscl . create /users/${euser} shell ${eshell}
663 dscl . create /users/${euser} home ${ehome}
664 dscl . create /users/${euser} realname "added by portage for ${PN}"
665 ### Add the user to the groups specified
666 for g in ${egroups}
667 do
668 dscl . merge /groups/${g} users ${euser}
669 done
670 else
671 einfo "Extra options are not supported on macos yet"
672 einfo "Please report the ebuild along with the info below"
673 einfo "eextra: ${eextra}"
674 die "Required function missing"
675 fi
676 else
677 if [ -z "${eextra}" ]
678 then
586 useradd ${opts} ${euser} \ 679 useradd ${opts} ${euser} \
587 -c "added by portage for ${PN}" \ 680 -c "added by portage for ${PN}" \
588 || die "enewuser failed" 681 || die "enewuser failed"
589 else 682 else
590 einfo " - Extra: ${eextra}" 683 einfo " - Extra: ${eextra}"
591 useradd ${opts} ${euser} ${eextra} \ 684 useradd ${opts} ${euser} ${eextra} \
592 || die "enewuser failed" 685 || die "enewuser failed"
686 fi
593 fi 687 fi
594 export SANDBOX_ON="${oldsandbox}" 688 export SANDBOX_ON="${oldsandbox}"
595 689
596 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ] 690 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ]
597 then 691 then
… …
618 then 712 then
619 eerror "No group specified !" 713 eerror "No group specified !"
620 die "Cannot call enewgroup without a group" 714 die "Cannot call enewgroup without a group"
621 fi 715 fi
622 716
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 717 # see if group already exists
629 if [ "${egroup}" == "${realgroup}" ] 718 if [ "${egroup}" == "`egetent group \"${egroup}\" | cut -d: -f1`" ]
630 then 719 then
631 return 0 720 return 0
632 fi 721 fi
633 einfo "Adding group '${egroup}' to your system ..." 722 einfo "Adding group '${egroup}' to your system ..."
634 723
… …
639 local egid="$1"; shift 728 local egid="$1"; shift
640 if [ ! -z "${egid}" ] 729 if [ ! -z "${egid}" ]
641 then 730 then
642 if [ "${egid}" -gt 0 ] 731 if [ "${egid}" -gt 0 ]
643 then 732 then
733 if [ -z "`egetent group ${egid}`" ]
734 then
735 if [ "${ARCH}" == "macos" ] ; then
736 opts="${opts} ${egid}"
737 else
644 opts="${opts} -g ${egid}" 738 opts="${opts} -g ${egid}"
739 fi
740 else
741 egid="next available; requested gid taken"
742 fi
645 else 743 else
646 eerror "Groupid given but is not greater than 0 !" 744 eerror "Groupid given but is not greater than 0 !"
647 die "${egid} is not a valid GID" 745 die "${egid} is not a valid GID"
648 fi 746 fi
649 else 747 else
… …
656 opts="${opts} ${eextra}" 754 opts="${opts} ${eextra}"
657 755
658 # add the group 756 # add the group
659 local oldsandbox="${SANDBOX_ON}" 757 local oldsandbox="${SANDBOX_ON}"
660 export SANDBOX_ON="0" 758 export SANDBOX_ON="0"
759 if [ "${ARCH}" == "macos" ];
760 then
761 if [ ! -z "${eextra}" ];
762 then
763 einfo "Extra options are not supported on macos yet"
764 einfo "Please report the ebuild along with the info below"
765 einfo "eextra: ${eextra}"
766 die "Required function missing"
767 fi
768
769 # If we need the next available
770 case ${egid} in
771 *[!0-9]*) # Non numeric
772 for egid in `jot 898 101`; do
773 [ -z "`egetent group ${egid}`" ] && break
774 done
775 esac
776 dscl . create /groups/${egroup} gid ${egid}
777 dscl . create /groups/${egroup} passwd '*'
778 else
661 groupadd ${opts} ${egroup} || die "enewgroup failed" 779 groupadd ${opts} ${egroup} || die "enewgroup failed"
780 fi
662 export SANDBOX_ON="${oldsandbox}" 781 export SANDBOX_ON="${oldsandbox}"
663} 782}
664 783
665# Simple script to replace 'dos2unix' binaries 784# Simple script to replace 'dos2unix' binaries
666# vapier@gentoo.org 785# vapier@gentoo.org
… …
687# name: the name that will show up in the menu 806# name: the name that will show up in the menu
688# icon: give your little like a pretty little icon ... 807# icon: give your little like a pretty little icon ...
689# this can be relative (to /usr/share/pixmaps) or 808# this can be relative (to /usr/share/pixmaps) or
690# a full path to an icon 809# a full path to an icon
691# type: what kind of application is this ? for categories: 810# type: what kind of application is this ? for categories:
692# http://www.freedesktop.org/standards/menu/draft/menu-spec/menu-spec.html 811# http://www.freedesktop.org/standards/menu-spec/
693# path: if your app needs to startup in a specific dir 812# path: if your app needs to startup in a specific dir
694make_desktop_entry() { 813make_desktop_entry() {
695 [ -z "$1" ] && eerror "You must specify the executable" && return 1 814 [ -z "$1" ] && eerror "You must specify the executable" && return 1
696 815
697 local exec="${1}" 816 local exec="${1}"
698 local name="${2:-${PN}}" 817 local name="${2:-${PN}}"
699 local icon="${3:-${PN}.png}" 818 local icon="${3:-${PN}.png}"
700 local type="${4}" 819 local type="${4}"
820 local subdir="${6}"
701 local path="${5:-${GAMES_PREFIX}}" 821 local path="${5:-${GAMES_PREFIX}}"
702 if [ -z "${type}" ] 822 if [ -z "${type}" ]
703 then 823 then
704 case ${CATEGORY} in 824 case ${CATEGORY} in
705 "app-emulation") 825 "app-emulation")
706 type=Emulator 826 type=Emulator
827 subdir="Emulation"
707 ;; 828 ;;
708 "games-"*) 829 "games-"*)
709 type=Game 830 type=Game
831 subdir="Games"
710 ;; 832 ;;
711 "net-"*) 833 "net-"*)
712 type=Network; 834 type=Network
835 subdir="${type}"
713 ;; 836 ;;
714 *) 837 *)
715 type= 838 type=
839 subdir=
716 ;; 840 ;;
717 esac 841 esac
718 fi 842 fi
719 local desktop="${T}/${exec}.desktop" 843 local desktop="${T}/${exec}.desktop"
720 844
… …
750 # done 874 # done
751 #fi 875 #fi
752 876
753 if [ -d "/usr/share/applnk" ] 877 if [ -d "/usr/share/applnk" ]
754 then 878 then
755 insinto /usr/share/applnk/${type} 879 insinto /usr/share/applnk/${subdir}
756 doins ${desktop} 880 doins ${desktop}
757 fi 881 fi
758 882
759 return 0 883 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} 884}
900 885
901# for internal use only (unpack_pdv and unpack_makeself) 886# for internal use only (unpack_pdv and unpack_makeself)
902find_unpackable_file() { 887find_unpackable_file() {
903 local src="$1" 888 local src="$1"
… …
1071 tail -n +${skip} ${src} | bzip2 -dc | tar --no-same-owner -xf - 1056 tail -n +${skip} ${src} | bzip2 -dc | tar --no-same-owner -xf -
1072 ;; 1057 ;;
1073 gzip*) 1058 gzip*)
1074 tail -n +${skip} ${src} | tar --no-same-owner -xzf - 1059 tail -n +${skip} ${src} | tar --no-same-owner -xzf -
1075 ;; 1060 ;;
1061 compress*)
1062 tail -n +${skip} ${src} | gunzip | tar --no-same-owner -xf -
1063 ;;
1076 *) 1064 *)
1065 eerror "Unknown filetype \"${filetype}\" ?"
1077 false 1066 false
1078 ;; 1067 ;;
1079 esac 1068 esac
1080 assert "failure unpacking (${filetype}) makeself ${shrtsrc} ('${ver}' +${skip})" 1069 assert "failure unpacking (${filetype}) makeself ${shrtsrc} ('${ver}' +${skip})"
1081} 1070}
… …
1101 local l="`basename ${lic}`" 1090 local l="`basename ${lic}`"
1102 1091
1103 # here is where we check for the licenses the user already 1092 # here is where we check for the licenses the user already
1104 # accepted ... if we don't find a match, we make the user accept 1093 # accepted ... if we don't find a match, we make the user accept
1105 local alic 1094 local alic
1106 for alic in ${ACCEPT_LICENSE} ; do 1095 for alic in "${ACCEPT_LICENSE}" ; do
1107 [ "${alic}" == "*" ] && return 0 1096 [ "${alic}" == "*" ] && return 0
1108 [ "${alic}" == "${l}" ] && return 0 1097 [ "${alic}" == "${l}" ] && return 0
1109 done 1098 done
1110 1099
1111 local licmsg="`mymktemp ${T}`" 1100 local licmsg="`mymktemp ${T}`"
… …
1131 eerror "You MUST accept the license to continue! Exiting!" 1120 eerror "You MUST accept the license to continue! Exiting!"
1132 die "Failed to accept license" 1121 die "Failed to accept license"
1133 ;; 1122 ;;
1134 esac 1123 esac
1135} 1124}
1125
1126# Aquire cd(s) for those lovely cd-based emerges. Yes, this violates
1127# the whole 'non-interactive' policy, but damnit I want CD support !
1128#
1129# with these cdrom functions we handle all the user interaction and
1130# standardize everything. all you have to do is call cdrom_get_cds()
1131# and when the function returns, you can assume that the cd has been
1132# found at CDROM_ROOT.
1133#
1134# normally the cdrom functions will refer to the cds as 'cd #1', 'cd #2',
1135# etc... if you want to give the cds better names, then just export
1136# the CDROM_NAME_X variables before calling cdrom_get_cds().
1137#
1138# for those multi cd ebuilds, see the cdrom_load_next_cd() below.
1139#
1140# Usage: cdrom_get_cds <file on cd1> [file on cd2] [file on cd3] [...]
1141# - this will attempt to locate a cd based upon a file that is on
1142# the cd ... the more files you give this function, the more cds
1143# the cdrom functions will handle
1144cdrom_get_cds() {
1145 # first we figure out how many cds we're dealing with by
1146 # the # of files they gave us
1147 local cdcnt=0
1148 local f=
1149 for f in "$@" ; do
1150 cdcnt=$((cdcnt + 1))
1151 export CDROM_CHECK_${cdcnt}="$f"
1152 done
1153 export CDROM_TOTAL_CDS=${cdcnt}
1154 export CDROM_CURRENT_CD=1
1155
1156 # now we see if the user gave use CD_ROOT ...
1157 # if they did, let's just believe them that it's correct
1158 if [ ! -z "${CD_ROOT}" ] ; then
1159 export CDROM_ROOT="${CD_ROOT}"
1160 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1161 return
1162 fi
1163 # do the same for CD_ROOT_X
1164 if [ ! -z "${CD_ROOT_1}" ] ; then
1165 local var=
1166 cdcnt=0
1167 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do
1168 cdcnt=$((cdcnt + 1))
1169 var="CD_ROOT_${cdcnt}"
1170 if [ -z "${!var}" ] ; then
1171 eerror "You must either use just the CD_ROOT"
1172 eerror "or specify ALL the CD_ROOT_X variables."
1173 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."
1174 die "could not locate CD_ROOT_${cdcnt}"
1175 fi
1176 export CDROM_ROOTS_${cdcnt}="${!var}"
1177 done
1178 export CDROM_ROOT=${CDROM_ROOTS_1}
1179 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1180 return
1181 fi
1182
1183 if [ ${CDROM_TOTAL_CDS} -eq 1 ] ; then
1184 einfon "This ebuild will need the "
1185 if [ -z "${CDROM_NAME}" ] ; then
1186 echo "cdrom for ${PN}."
1187 else
1188 echo "${CDROM_NAME}."
1189 fi
1190 echo
1191 einfo "If you do not have the CD, but have the data files"
1192 einfo "mounted somewhere on your filesystem, just export"
1193 einfo "the variable CD_ROOT so that it points to the"
1194 einfo "directory containing the files."
1195 echo
1196 else
1197 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1198 cdcnt=0
1199 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do
1200 cdcnt=$((cdcnt + 1))
1201 var="CDROM_NAME_${cdcnt}"
1202 [ ! -z "${!var}" ] && einfo " CD ${cdcnt}: ${!var}"
1203 done
1204 echo
1205 einfo "If you do not have the CDs, but have the data files"
1206 einfo "mounted somewhere on your filesystem, just export"
1207 einfo "the following variables so they point to the right place:"
1208 einfon ""
1209 cdcnt=0
1210 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do
1211 cdcnt=$((cdcnt + 1))
1212 echo -n " CD_ROOT_${cdcnt}"
1213 done
1214 echo
1215 einfo "Or, if you have all the files in the same place, or"
1216 einfo "you only have one cdrom, you can export CD_ROOT"
1217 einfo "and that place will be used as the same data source"
1218 einfo "for all the CDs."
1219 echo
1220 fi
1221 export CDROM_CURRENT_CD=0
1222 cdrom_load_next_cd
1223}
1224
1225# this is only used when you need access to more than one cd.
1226# when you have finished using the first cd, just call this function.
1227# when it returns, CDROM_ROOT will be pointing to the second cd.
1228# remember, you can only go forward in the cd chain, you can't go back.
1229cdrom_load_next_cd() {
1230 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1231 local var=
1232
1233 if [ ! -z "${CD_ROOT}" ] ; then
1234 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1235 return
1236 fi
1237
1238 unset CDROM_ROOT
1239 var=CDROM_ROOTS_${CDROM_CURRENT_CD}
1240 if [ -z "${!var}" ] ; then
1241 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1242 cdrom_locate_file_on_cd ${!var}
1243 else
1244 export CDROM_ROOT="${!var}"
1245 fi
1246
1247 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1248}
1249
1250# this is used internally by the cdrom_get_cds() and cdrom_load_next_cd()
1251# functions. this should *never* be called from an ebuild.
1252# all it does is try to locate a give file on a cd ... if the cd isn't
1253# found, then a message asking for the user to insert the cdrom will be
1254# displayed and we'll hang out here until:
1255# (1) the file is found on a mounted cdrom
1256# (2) the user hits CTRL+C
1257cdrom_locate_file_on_cd() {
1258 while [ -z "${CDROM_ROOT}" ] ; do
1259 local dir="$(dirname ${@})"
1260 local file="$(basename ${@})"
1261 local mline=""
1262 local showedmsg=0
1263
1264 for mline in `mount | egrep -e '(iso|cdrom)' | awk '{print $3}'` ; do
1265 [ -d "${mline}/${dir}" ] || continue
1266 [ ! -z "$(find ${mline}/${dir} -iname ${file} -maxdepth 1)" ] \
1267 && export CDROM_ROOT=${mline}
1268 done
1269
1270 if [ -z "${CDROM_ROOT}" ] ; then
1271 echo
1272 if [ ${showedmsg} -eq 0 ] ; then
1273 if [ ${CDROM_TOTAL_CDS} -eq 1 ] ; then
1274 if [ -z "${CDROM_NAME}" ] ; then
1275 einfo "Please insert the cdrom for ${PN} now !"
1276 else
1277 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1278 fi
1279 else
1280 if [ -z "${CDROM_NAME_1}" ] ; then
1281 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1282 else
1283 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1284 einfo "Please insert+mount the ${!var} cdrom now !"
1285 fi
1286 fi
1287 showedmsg=1
1288 fi
1289 einfo "Press return to scan for the cd again"
1290 einfo "or hit CTRL+C to abort the emerge."
1291 read
1292 fi
1293 done
1294}
1295
1296# Make sure that LINGUAS only contains languages that
1297# a package can support
1298#
1299# usage: strip-linguas <allow LINGUAS>
1300# strip-linguas -i <directories of .po files>
1301# strip-linguas -u <directories of .po files>
1302#
1303# The first form allows you to specify a list of LINGUAS.
1304# The -i builds a list of po files found in all the
1305# directories and uses the intersection of the lists.
1306# The -u builds a list of po files found in all the
1307# directories and uses the union of the lists.
1308strip-linguas() {
1309 local ls newls
1310 if [ "$1" == "-i" ] || [ "$1" == "-u" ] ; then
1311 local op="$1"; shift
1312 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift
1313 local d f
1314 for d in "$@" ; do
1315 if [ "${op}" == "-u" ] ; then
1316 newls="${ls}"
1317 else
1318 newls=""
1319 fi
1320 for f in $(find "$d" -name '*.po' -printf '%f ') ; do
1321 if [ "${op}" == "-i" ] ; then
1322 [ "${ls/ ${f} /}" != "${ls}" ] && newls="${newls} ${f}"
1323 else
1324 [ "${ls/ ${f} /}" == "${ls}" ] && newls="${newls} ${f}"
1325 fi
1326 done
1327 ls="${newls}"
1328 done
1329 ls="${ls//.po}"
1330 else
1331 ls="$@"
1332 fi
1333
1334 ls=" ${ls} "
1335 newls=""
1336 for f in ${LINGUAS} ; do
1337 if [ "${ls/ ${f} /}" != "${ls}" ] ; then
1338 nl="${newls} ${f}"
1339 else
1340 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA"
1341 fi
1342 done
1343 if [ -z "${newls}" ] ; then
1344 unset LINGUAS
1345 else
1346 export LINGUAS="${newls}"
1347 fi
1348}
Legend:
Removed from v.1.73  
changed lines
  Added in v.1.97
  ViewVC Help
Powered by ViewVC 1.1.20