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

Diff of /eclass/eutils.eclass

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

Revision 1.33 Revision 1.92
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.33 2003/06/12 18:21:23 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.92 2004/08/03 17:24:52 vapier 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
15DEPEND="$DEPEND !bootstrap? ( sys-devel/patch )" 15DEPEND="!bootstrap? ( sys-devel/patch )"
16 16
17DESCRIPTION="Based on the ${ECLASS} eclass" 17DESCRIPTION="Based on the ${ECLASS} eclass"
18 18
19# This function generate linker scripts in /usr/lib for dynamic 19# This function generate linker scripts in /usr/lib for dynamic
20# libs in /lib. This is to fix linking problems when you have 20# libs in /lib. This is to fix linking problems when you have
88# Default directory where patches are located 88# Default directory where patches are located
89EPATCH_SOURCE="${WORKDIR}/patch" 89EPATCH_SOURCE="${WORKDIR}/patch"
90# Default extension for patches 90# Default extension for patches
91EPATCH_SUFFIX="patch.bz2" 91EPATCH_SUFFIX="patch.bz2"
92# Default options for patch 92# Default options for patch
93# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571
93EPATCH_OPTS="" 94EPATCH_OPTS="-g0"
94# List of patches not to apply. Not this is only file names, 95# List of patches not to apply. Not this is only file names,
95# and not the full path .. 96# and not the full path ..
96EPATCH_EXCLUDE="" 97EPATCH_EXCLUDE=""
97# Change the printed message for a single patch. 98# Change the printed message for a single patch.
98EPATCH_SINGLE_MSG="" 99EPATCH_SINGLE_MSG=""
257 else 258 else
258 PATCH_TARGET="${x}" 259 PATCH_TARGET="${x}"
259 fi 260 fi
260 261
261 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 262 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
262 echo "patch ${popts} -p${count} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 263 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
263 264
264 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 265 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
265 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 266 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
266 267
267 if [ "${PATCH_SUFFIX}" != "patch" ] 268 if [ "${PATCH_SUFFIX}" != "patch" ]
274 count=5 275 count=5
275 break 276 break
276 fi 277 fi
277 fi 278 fi
278 279
279 if (cat ${PATCH_TARGET} | patch ${popts} --dry-run -f -p${count}) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1 280 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1
280 then 281 then
281 draw_line "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 282 draw_line "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real
282 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 283 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real
283 echo "ACTUALLY APPLYING ${x##*/}..." >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 284 echo "ACTUALLY APPLYING ${x##*/}..." >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real
284 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 285 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real
285 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 286 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real
286 287
287 cat ${PATCH_TARGET} | patch ${popts} -p${count} >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 2>&1 288 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 2>&1
288 289
289 if [ "$?" -ne 0 ] 290 if [ "$?" -ne 0 ]
290 then 291 then
291 cat ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 292 cat ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
292 echo 293 echo
400 ADMINPARAM="${ADMINPARAM/-j}" 401 ADMINPARAM="${ADMINPARAM/-j}"
401 fi 402 fi
402 403
403 export MAKEOPTS="`echo ${MAKEOPTS} | sed -e 's:-j *[0-9]*::g'`" 404 export MAKEOPTS="`echo ${MAKEOPTS} | sed -e 's:-j *[0-9]*::g'`"
404 405
405 if [ "${ARCH}" = "x86" -o "${ARCH}" = "hppa" -o \ 406 if [ "${ARCH}" = "amd64" -o "${ARCH}" = "x86" -o "${ARCH}" = "hppa" -o \
406 "${ARCH}" = "arm" -o "${ARCH}" = "mips" ] 407 "${ARCH}" = "arm" -o "${ARCH}" = "mips" -o "${ARCH}" = "ia64" ]
407 then 408 then
408 # these archs will always have "[Pp]rocessor" 409 # these archs will always have "[Pp]rocessor"
409 jobs="$((`grep -c ^[Pp]rocessor /proc/cpuinfo` * 2))" 410 jobs="$((`grep -c ^[Pp]rocessor /proc/cpuinfo` * 2))"
410 411
411 elif [ "${ARCH}" = "sparc" -o "${ARCH}" = "sparc64" ] 412 elif [ "${ARCH}" = "sparc" -o "${ARCH}" = "sparc64" ]
421 jobs="$((`grep "^cpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))" 422 jobs="$((`grep "^cpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
422 else 423 else
423 jobs=2 424 jobs=2
424 fi 425 fi
425 426
426 elif [ "${ARCH}" = "ppc" ] 427 elif [ "${ARCH}" = "ppc" -o "${ARCH}" = "ppc64" ]
427 then 428 then
428 # ppc has "processor", but only when compiled with SMP 429 # ppc has "processor", but only when compiled with SMP
429 if [ "`grep -c "^processor" /proc/cpuinfo`" -eq 1 ] 430 if [ "`grep -c "^processor" /proc/cpuinfo`" -eq 1 ]
430 then 431 then
431 jobs="$((`grep -c ^processor /proc/cpuinfo` * 2))" 432 jobs="$((`grep -c ^processor /proc/cpuinfo` * 2))"
432 else 433 else
433 jobs=2 434 jobs=2
434 fi 435 fi
436 elif [ "${ARCH}" = "s390" ]
437 then
438 # s390 has "# processors : "
439 jobs="$((`grep "^\# processors" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
435 else 440 else
436 jobs="$((`grep -c ^cpu /proc/cpuinfo` * 2))" 441 jobs="$((`grep -c ^cpu /proc/cpuinfo` * 2))"
437 die "Unknown ARCH -- ${ARCH}!" 442 die "Unknown ARCH -- ${ARCH}!"
438 fi 443 fi
439 444
451 export MAKEOPTS="${MAKEOPTS} -j${ADMINPARAM}" 456 export MAKEOPTS="${MAKEOPTS} -j${ADMINPARAM}"
452 else 457 else
453 einfo "Setting make jobs to \"-j${jobs}\" to ensure successful merge..." 458 einfo "Setting make jobs to \"-j${jobs}\" to ensure successful merge..."
454 export MAKEOPTS="${MAKEOPTS} -j${jobs}" 459 export MAKEOPTS="${MAKEOPTS} -j${jobs}"
455 fi 460 fi
461 fi
462}
463
464# Cheap replacement for when debianutils (and thus mktemp)
465# does not exist on the users system
466# vapier@gentoo.org
467#
468# Takes just 1 parameter (the directory to create tmpfile in)
469mymktemp() {
470 local topdir="$1"
471
472 [ -z "${topdir}" ] && topdir=/tmp
473 if [ "`which mktemp 2>/dev/null`" ]
474 then
475 mktemp -p ${topdir}
476 else
477 local tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}"
478 touch ${tmp}
479 echo ${tmp}
480 fi
481}
482
483# Small wrapper for getent (Linux) and nidump (Mac OS X)
484# used in enewuser()/enewgroup()
485# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
486#
487# egetent(database, key)
488egetent() {
489 if [ "${ARCH}" == "macos" ] ; then
490 case "$2" in
491 *[!0-9]*) # Non numeric
492 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
493 ;;
494 *) # Numeric
495 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
496 ;;
497 esac
498 else
499 getent $1 $2
456 fi 500 fi
457} 501}
458 502
459# Simplify/standardize adding users to the system 503# Simplify/standardize adding users to the system
460# vapier@gentoo.org 504# vapier@gentoo.org
470# groups: none 514# groups: none
471# extra: comment of 'added by portage for ${PN}' 515# extra: comment of 'added by portage for ${PN}'
472enewuser() { 516enewuser() {
473 # get the username 517 # get the username
474 local euser="$1"; shift 518 local euser="$1"; shift
475 if [ -z "${euser}" ] ; then 519 if [ -z "${euser}" ]
520 then
476 eerror "No username specified !" 521 eerror "No username specified !"
477 die "Cannot call enewuser without a username" 522 die "Cannot call enewuser without a username"
478 fi 523 fi
524
525 # lets see if the username already exists
526 if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ]
527 then
528 return 0
529 fi
479 einfo "Adding user '${euser}' to your system ..." 530 einfo "Adding user '${euser}' to your system ..."
480 531
481 # setup a file for testing usernames/groups
482 local tmpfile="`mktemp -p ${T}`"
483 touch ${tmpfile}
484 chown ${euser} ${tmpfile} >& /dev/null
485 local realuser="`ls -l ${tmpfile} | awk '{print $3}'`"
486
487 # see if user already exists
488 if [ "${euser}" == "${realuser}" ] ; then
489 einfo "${euser} already exists on your system :)"
490 return 0
491 fi
492
493 # options to pass to useradd 532 # options to pass to useradd
494 local opts="" 533 local opts=
495 534
496 # handle uid 535 # handle uid
497 local euid="$1"; shift 536 local euid="$1"; shift
498 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] ; then 537 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ]
538 then
499 if [ ${euid} -gt 0 ] ; then 539 if [ "${euid}" -gt 0 ]
500 opts="${opts} -u ${euid}" 540 then
541 if [ ! -z "`egetent passwd ${euid}`" ]
542 then
543 euid="next"
544 fi
501 else 545 else
502 eerror "Userid given but is not greater than 0 !" 546 eerror "Userid given but is not greater than 0 !"
503 die "${euid} is not a valid UID" 547 die "${euid} is not a valid UID"
504 fi 548 fi
505 else 549 else
506 euid="next available" 550 euid="next"
551 fi
552 if [ "${euid}" == "next" ]
553 then
554 local pwrange
555 if [ "${ARCH}" == "macos" ] ; then
556 pwrange="`jot 898 101`"
557 else
558 pwrange="`seq 101 999`"
507 fi 559 fi
560 for euid in ${pwrange} ; do
561 [ -z "`egetent passwd ${euid}`" ] && break
562 done
563 fi
564 opts="${opts} -u ${euid}"
508 einfo " - Userid: ${euid}" 565 einfo " - Userid: ${euid}"
509 566
510 # handle shell 567 # handle shell
511 local eshell="$1"; shift 568 local eshell="$1"; shift
512 if [ ! -z "${eshell}" ] ; then 569 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ]
570 then
513 if [ ! -e ${eshell} ] ; then 571 if [ ! -e "${eshell}" ]
572 then
514 eerror "A shell was specified but it does not exist !" 573 eerror "A shell was specified but it does not exist !"
515 die "${eshell} does not exist" 574 die "${eshell} does not exist"
516 fi 575 fi
517 else 576 else
518 eshell=/bin/false 577 eshell="/bin/false"
519 fi 578 fi
520 einfo " - Shell: ${eshell}" 579 einfo " - Shell: ${eshell}"
521 opts="${opts} -s ${eshell}" 580 opts="${opts} -s ${eshell}"
522 581
523 # handle homedir 582 # handle homedir
524 local ehome="$1"; shift 583 local ehome="$1"; shift
525 if [ -z "${ehome}" ] ; then 584 if [ -z "${ehome}" ] && [ "${eshell}" != "-1" ]
585 then
526 ehome=/dev/null 586 ehome="/dev/null"
527 fi 587 fi
528 einfo " - Home: ${ehome}" 588 einfo " - Home: ${ehome}"
529 opts="${opts} -d ${ehome}" 589 opts="${opts} -d ${ehome}"
530 590
531 # handle groups 591 # handle groups
532 local egroups="$1"; shift 592 local egroups="$1"; shift
533 if [ ! -z "${egroups}" ] ; then 593 if [ ! -z "${egroups}" ]
534 local realgroup 594 then
535 local oldifs="${IFS}" 595 local oldifs="${IFS}"
536 export IFS="," 596 export IFS=","
537 for g in ${egroups} ; do 597 for g in ${egroups}
538 chgrp ${g} ${tmpfile} >& /dev/null 598 do
539 realgroup="`ls -l ${tmpfile} | awk '{print $4}'`" 599 if [ -z "`egetent group \"${g}\"`" ]
540 if [ "${g}" != "${realgroup}" ] ; then 600 then
541 eerror "You must add ${g} to the system first" 601 eerror "You must add group ${g} to the system first"
542 die "${g} is not a valid GID" 602 die "${g} is not a valid GID"
543 fi 603 fi
544 done 604 done
545 export IFS="${oldifs}" 605 export IFS="${oldifs}"
546 opts="${opts} -g ${egroups}" 606 opts="${opts} -g ${egroups}"
549 fi 609 fi
550 einfo " - Groups: ${egroups}" 610 einfo " - Groups: ${egroups}"
551 611
552 # handle extra and add the user 612 # handle extra and add the user
553 local eextra="$@" 613 local eextra="$@"
554 local oldsandbox="${oldsandbox}" 614 local oldsandbox="${SANDBOX_ON}"
555 export SANDBOX_ON="0" 615 export SANDBOX_ON="0"
616 if [ "${ARCH}" == "macos" ];
617 then
618 ### Make the user
556 if [ -z "${eextra}" ] ; then 619 if [ -z "${eextra}" ]
620 then
621 dscl . create /users/${euser} uid ${euid}
622 dscl . create /users/${euser} shell ${eshell}
623 dscl . create /users/${euser} home ${ehome}
624 dscl . create /users/${euser} realname "added by portage for ${PN}"
625 ### Add the user to the groups specified
626 for g in ${egroups}
627 do
628 dscl . merge /groups/${g} users ${euser}
629 done
630 else
631 einfo "Extra options are not supported on macos yet"
632 einfo "Please report the ebuild along with the info below"
633 einfo "eextra: ${eextra}"
634 die "Required function missing"
635 fi
636 else
637 if [ -z "${eextra}" ]
638 then
557 useradd ${opts} ${euser} \ 639 useradd ${opts} ${euser} \
558 -c "added by portage for ${PN}" \ 640 -c "added by portage for ${PN}" \
559 || die "enewuser failed" 641 || die "enewuser failed"
560 else 642 else
561 einfo " - Extra: ${eextra}" 643 einfo " - Extra: ${eextra}"
562 useradd ${opts} ${euser} ${eextra} \ 644 useradd ${opts} ${euser} ${eextra} \
563 || die "enewuser failed" 645 || die "enewuser failed"
646 fi
564 fi 647 fi
565 export SANDBOX_ON="${oldsandbox}" 648 export SANDBOX_ON="${oldsandbox}"
566 649
567 if [ ! -e ${ehome} ] && [ ! -e ${D}/${ehome} ] ; then 650 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ]
651 then
568 einfo " - Creating ${ehome} in ${D}" 652 einfo " - Creating ${ehome} in ${D}"
569 dodir ${ehome} 653 dodir ${ehome}
570 fperms ${euser} ${ehome} 654 fowners ${euser} ${ehome}
655 fperms 755 ${ehome}
571 fi 656 fi
572} 657}
573 658
574# Simplify/standardize adding groups to the system 659# Simplify/standardize adding groups to the system
575# vapier@gentoo.org 660# vapier@gentoo.org
581# gid: next available (see groupadd(8)) 666# gid: next available (see groupadd(8))
582# extra: none 667# extra: none
583enewgroup() { 668enewgroup() {
584 # get the group 669 # get the group
585 local egroup="$1"; shift 670 local egroup="$1"; shift
586 if [ -z "${egroup}" ] ; then 671 if [ -z "${egroup}" ]
672 then
587 eerror "No group specified !" 673 eerror "No group specified !"
588 die "Cannot call enewgroup without a group" 674 die "Cannot call enewgroup without a group"
589 fi 675 fi
676
677 # see if group already exists
678 if [ "${egroup}" == "`egetent group \"${egroup}\" | cut -d: -f1`" ]
679 then
680 return 0
681 fi
590 einfo "Adding group '${egroup}' to your system ..." 682 einfo "Adding group '${egroup}' to your system ..."
591 683
592 # setup a file for testing groupname
593 local tmpfile="`mktemp -p ${T}`"
594 touch ${tmpfile}
595 chgrp ${egroup} ${tmpfile} >& /dev/null
596 local realgroup="`ls -l ${tmpfile} | awk '{print $4}'`"
597
598 # see if group already exists
599 if [ "${egroup}" == "${realgroup}" ] ; then
600 einfo "${egroup} already exists on your system :)"
601 return 0
602 fi
603
604 # options to pass to useradd 684 # options to pass to useradd
605 local opts="" 685 local opts=
606 686
607 # handle gid 687 # handle gid
608 local egid="$1"; shift 688 local egid="$1"; shift
609 if [ ! -z "${egid}" ] ; then 689 if [ ! -z "${egid}" ]
690 then
610 if [ ${egid} -gt 0 ] ; then 691 if [ "${egid}" -gt 0 ]
692 then
693 if [ -z "`egetent group ${egid}`" ]
694 then
695 if [ "${ARCH}" == "macos" ] ; then
696 opts="${opts} ${egid}"
697 else
611 opts="${opts} -g ${egid}" 698 opts="${opts} -g ${egid}"
699 fi
700 else
701 egid="next available; requested gid taken"
702 fi
612 else 703 else
613 eerror "Groupid given but is not greater than 0 !" 704 eerror "Groupid given but is not greater than 0 !"
614 die "${egid} is not a valid GID" 705 die "${egid} is not a valid GID"
615 fi 706 fi
616 else 707 else
621 # handle extra 712 # handle extra
622 local eextra="$@" 713 local eextra="$@"
623 opts="${opts} ${eextra}" 714 opts="${opts} ${eextra}"
624 715
625 # add the group 716 # add the group
626 local oldsandbox="${oldsandbox}" 717 local oldsandbox="${SANDBOX_ON}"
627 export SANDBOX_ON="0" 718 export SANDBOX_ON="0"
719 if [ "${ARCH}" == "macos" ];
720 then
721 if [ ! -z "${eextra}" ];
722 then
723 einfo "Extra options are not supported on macos yet"
724 einfo "Please report the ebuild along with the info below"
725 einfo "eextra: ${eextra}"
726 die "Required function missing"
727 fi
728
729 # If we need the next available
730 case ${egid} in
731 *[!0-9]*) # Non numeric
732 for egid in `jot 898 101`; do
733 [ -z "`egetent group ${egid}`" ] && break
734 done
735 esac
736 dscl . create /groups/${egroup} gid ${egid}
737 dscl . create /groups/${egroup} passwd '*'
738 else
628 groupadd ${opts} ${egroup} || die "enewgroup failed" 739 groupadd ${opts} ${egroup} || die "enewgroup failed"
740 fi
629 export SANDBOX_ON="${oldsandbox}" 741 export SANDBOX_ON="${oldsandbox}"
630} 742}
631 743
632# Simple script to replace 'dos2unix' binaries 744# Simple script to replace 'dos2unix' binaries
633# vapier@gentoo.org 745# vapier@gentoo.org
634# 746#
635# edos2unix(file, <more files>...) 747# edos2unix(file, <more files>...)
636edos2unix() { 748edos2unix() {
637 for f in $@ ; do 749 for f in "$@"
750 do
638 cp ${f} ${T}/edos2unix 751 cp "${f}" ${T}/edos2unix
639 sed 's/\r$//' ${T}/edos2unix > ${f} 752 sed 's/\r$//' ${T}/edos2unix > "${f}"
640 done 753 done
641} 754}
642 755
643# new convinience patch wapper function to eventually replace epatch(), $PATCHES, $PATCHES1, src_unpack:patch, src_unpack:autopatch and /usr/bin/patch 756# Make a desktop file !
644# Features: 757# Great for making those icons in kde/gnome startmenu !
645# - bulk patch handling similar to epatch()'s 758# Amaze your friends ! Get the women ! Join today !
646# - automatic patch level detection like epatch()'s 759# gnome2 /usr/share/applications
647# - semiautomatic patch uncompression like epatch()'s (may switch to using /usr/bin/file for extra power, instead of just looking at the filename) 760# gnome1 /usr/share/gnome/apps/
648# - doesn't have the --dry-run overhead of epatch() - inspects patchfiles manually instead 761# KDE ${KDEDIR}/share/applnk /usr/share/applnk
649# - is called from base_src_unpack to handle $PATCHES to avoid defining src_unpack(-) just to use xpatch 762#
763# make_desktop_entry(<binary>, [name], [icon], [type], [path])
764#
765# binary: what binary does the app run with ?
766# name: the name that will show up in the menu
767# icon: give your little like a pretty little icon ...
768# this can be relative (to /usr/share/pixmaps) or
769# a full path to an icon
770# type: what kind of application is this ? for categories:
771# http://www.freedesktop.org/standards/menu-spec/
772# path: if your app needs to startup in a specific dir
773make_desktop_entry() {
774 [ -z "$1" ] && eerror "You must specify the executable" && return 1
650 775
651# accepts zero or more parameters specifying patchfiles and/or patchdirs 776 local exec="${1}"
777 local name="${2:-${PN}}"
778 local icon="${3:-${PN}.png}"
779 local type="${4}"
780 local subdir="${6}"
781 local path="${5:-${GAMES_PREFIX}}"
782 if [ -z "${type}" ]
783 then
784 case ${CATEGORY} in
785 "app-emulation")
786 type=Emulator
787 subdir="Emulation"
788 ;;
789 "games-"*)
790 type=Game
791 subdir="Games"
792 ;;
793 "net-"*)
794 type=Network
795 subdir="${type}"
796 ;;
797 *)
798 type=
799 subdir=
800 ;;
801 esac
802 fi
803 local desktop="${T}/${exec}.desktop"
652 804
653# known issues: 805echo "[Desktop Entry]
654# - only supports unified style patches (does anyone _really_ use anything else?) 806Encoding=UTF-8
655# - first file addressed in a patch can't have spaces in its name or in the path mentioned in the patchfile 807Version=0.9.2
656# (can be easily fixed to be: at least one file addressed in the patch must have no spaces...) 808Name=${name}
657xpatch() { 809Type=Application
810Comment=${DESCRIPTION}
811Exec=${exec}
812Path=${path}
813Icon=${icon}
814Categories=Application;${type};" > ${desktop}
658 815
659 debug-print-function $FUNCNAME $* 816 if [ -d "/usr/share/applications" ]
817 then
818 insinto /usr/share/applications
819 doins ${desktop}
820 fi
660 821
822 #if [ -d "/usr/share/gnome/apps" ]
823 #then
824 # insinto /usr/share/gnome/apps/Games
825 # doins ${desktop}
826 #fi
827
828 #if [ ! -z "`ls /usr/kde/* 2>/dev/null`" ]
829 #then
830 # for ver in /usr/kde/*
831 # do
832 # insinto ${ver}/share/applnk/Games
833 # doins ${desktop}
834 # done
835 #fi
836
837 if [ -d "/usr/share/applnk" ]
838 then
839 insinto /usr/share/applnk/${subdir}
840 doins ${desktop}
841 fi
842
843 return 0
844}
845
846# for internal use only (unpack_pdv and unpack_makeself)
847find_unpackable_file() {
661 local list="" 848 local src="$1"
662 local list2="" 849 if [ -z "${src}" ]
663 declare -i plevel 850 then
851 src="${DISTDIR}/${A}"
852 else
853 if [ -e "${DISTDIR}/${src}" ]
854 then
855 src="${DISTDIR}/${src}"
856 elif [ -e "${PWD}/${src}" ]
857 then
858 src="${PWD}/${src}"
859 elif [ -e "${src}" ]
860 then
861 src="${src}"
862 fi
863 fi
864 [ ! -e "${src}" ] && die "Could not find requested archive ${src}"
865 echo "${src}"
866}
664 867
665 # parse patch sources 868# Unpack those pesky pdv generated files ...
666 for x in $*; do 869# They're self-unpacking programs with the binary package stuffed in
667 debug-print "$FUNCNAME: parsing parameter $x" 870# the middle of the archive. Valve seems to use it a lot ... too bad
871# it seems to like to segfault a lot :(. So lets take it apart ourselves.
872#
873# Usage: unpack_pdv [file to unpack] [size of off_t]
874# - you have to specify the off_t size ... i have no idea how to extract that
875# information out of the binary executable myself. basically you pass in
876# the size of the off_t type (in bytes) on the machine that built the pdv
877# archive. one way to determine this is by running the following commands:
878# strings <pdv archive> | grep lseek
879# strace -elseek <pdv archive>
880# basically look for the first lseek command (we do the strings/grep because
881# sometimes the function call is _llseek or something) and steal the 2nd
882# parameter. here is an example:
883# root@vapier 0 pdv_unpack # strings hldsupdatetool.bin | grep lseek
884# lseek
885# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
886# lseek(3, -4, SEEK_END) = 2981250
887# thus we would pass in the value of '4' as the second parameter.
888unpack_pdv() {
889 local src="`find_unpackable_file $1`"
890 local sizeoff_t="$2"
891
892 [ -z "${sizeoff_t}" ] && die "No idea what off_t size was used for this pdv :("
893
894 local shrtsrc="`basename ${src}`"
895 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
896 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
897 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
898
899 # grab metadata for debug reasons
900 local metafile="`mymktemp ${T}`"
901 tail -c +$((${metaskip}+1)) ${src} > ${metafile}
902
903 # rip out the final file name from the metadata
904 local datafile="`tail -c +$((${metaskip}+1)) ${src} | strings | head -n 1`"
905 datafile="`basename ${datafile}`"
906
907 # now lets uncompress/untar the file if need be
908 local tmpfile="`mymktemp ${T}`"
909 tail -c +$((${tailskip}+1)) ${src} 2>/dev/null | head -c 512 > ${tmpfile}
910
911 local iscompressed="`file -b ${tmpfile}`"
912 if [ "${iscompressed:0:8}" == "compress" ] ; then
913 iscompressed=1
914 mv ${tmpfile}{,.Z}
915 gunzip ${tmpfile}
916 else
917 iscompressed=0
918 fi
919 local istar="`file -b ${tmpfile}`"
920 if [ "${istar:0:9}" == "POSIX tar" ] ; then
921 istar=1
922 else
923 istar=0
924 fi
925
926 #for some reason gzip dies with this ... dd cant provide buffer fast enough ?
927 #dd if=${src} ibs=${metaskip} count=1 \
928 # | dd ibs=${tailskip} skip=1 \
929 # | gzip -dc \
930 # > ${datafile}
931 if [ ${iscompressed} -eq 1 ] ; then
932 if [ ${istar} -eq 1 ] ; then
933 tail -c +$((${tailskip}+1)) ${src} 2>/dev/null \
934 | head -c $((${metaskip}-${tailskip})) \
935 | tar -xzf -
936 else
937 tail -c +$((${tailskip}+1)) ${src} 2>/dev/null \
938 | head -c $((${metaskip}-${tailskip})) \
939 | gzip -dc \
940 > ${datafile}
941 fi
942 else
943 if [ ${istar} -eq 1 ] ; then
944 tail -c +$((${tailskip}+1)) ${src} 2>/dev/null \
945 | head -c $((${metaskip}-${tailskip})) \
946 | tar --no-same-owner -xf -
947 else
948 tail -c +$((${tailskip}+1)) ${src} 2>/dev/null \
949 | head -c $((${metaskip}-${tailskip})) \
950 > ${datafile}
951 fi
952 fi
953 true
954 #[ -s "${datafile}" ] || die "failure unpacking pdv ('${metaskip}' '${tailskip}' '${datafile}')"
955 #assert "failure unpacking pdv ('${metaskip}' '${tailskip}' '${datafile}')"
956}
957
958# Unpack those pesky makeself generated files ...
959# They're shell scripts with the binary package tagged onto
960# the end of the archive. Loki utilized the format as does
961# many other game companies.
962#
963# Usage: unpack_makeself [file to unpack] [offset]
964# - If the file is not specified then unpack will utilize ${A}.
965# - If the offset is not specified then we will attempt to extract
966# the proper offset from the script itself.
967unpack_makeself() {
968 local src="`find_unpackable_file $1`"
969 local skip="$2"
970
971 local shrtsrc="`basename ${src}`"
972 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
973 if [ -z "${skip}" ]
974 then
975 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`"
976 local skip=0
977 case ${ver} in
978 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
979 skip=`grep -a ^skip= ${src} | cut -d= -f2`
980 ;;
981 2.0|2.0.1)
982 skip=`grep -a ^$'\t'tail ${src} | awk '{print $2}' | cut -b2-`
983 ;;
984 2.1.1)
985 skip=`grep -a ^offset= ${src} | awk '{print $2}' | cut -b2-`
986 let skip="skip + 1"
987 ;;
988 2.1.2)
989 skip=`grep -a ^offset= ${src} | awk '{print $3}' | head -n 1`
990 let skip="skip + 1"
991 ;;
992 2.1.3)
993 skip=`grep -a ^offset= ${src} | awk '{print $3}'`
994 let skip="skip + 1"
995 ;;
996 *)
997 eerror "I'm sorry, but I was unable to support the Makeself file."
998 eerror "The version I detected was '${ver}'."
999 eerror "Please file a bug about the file ${shrtsrc} at"
1000 eerror "http://bugs.gentoo.org/ so that support can be added."
1001 die "makeself version '${ver}' not supported"
1002 ;;
1003 esac
1004 debug-print "Detected Makeself version ${ver} ... using ${skip} as offset"
1005 fi
1006
1007 # lets grab the first few bytes of the file to figure out what kind of archive it is
1008 local tmpfile="`mymktemp ${T}`"
1009 tail -n +${skip} ${src} 2>/dev/null | head -c 512 > ${tmpfile}
1010 local filetype="`file -b ${tmpfile}`"
1011 case ${filetype} in
1012 *tar\ archive)
1013 tail -n +${skip} ${src} | tar --no-same-owner -xf -
1014 ;;
1015 bzip2*)
1016 tail -n +${skip} ${src} | bzip2 -dc | tar --no-same-owner -xf -
1017 ;;
1018 gzip*)
1019 tail -n +${skip} ${src} | tar --no-same-owner -xzf -
1020 ;;
1021 *)
1022 false
1023 ;;
1024 esac
1025 assert "failure unpacking (${filetype}) makeself ${shrtsrc} ('${ver}' +${skip})"
1026}
1027
1028# Display a license for user to accept.
1029#
1030# Usage: check_license [license]
1031# - If the file is not specified then ${LICENSE} is used.
1032check_license() {
1033 local lic=$1
668 if [ -f "$x" ]; then 1034 if [ -z "${lic}" ] ; then
669 list="$list $x" 1035 lic="${PORTDIR}/licenses/${LICENSE}"
1036 else
1037 if [ -e "${PORTDIR}/licenses/${src}" ] ; then
1038 lic="${PORTDIR}/licenses/${src}"
1039 elif [ -e "${PWD}/${src}" ] ; then
1040 lic="${PWD}/${src}"
670 elif [ -d "$x" ]; then 1041 elif [ -e "${src}" ] ; then
671 # handles patchdirs like epatch() for now: no recursion. 1042 lic="${src}"
672 # patches are sorted by filename, so with an xy_foo naming scheme you'll get the right order. 1043 fi
673 # only patches with _$ARCH_ or _all_ in their filenames are applied. 1044 fi
674 for file in `ls -A $x`; do 1045 [ ! -f "${lic}" ] && die "Could not find requested license ${src}"
675 debug-print "$FUNCNAME: parsing in subdir: file $file" 1046 local l="`basename ${lic}`"
676 if [ -f "$x/$file" ] && [ "${file}" != "${file/_all_}" -o "${file}" != "${file/_$ARCH_}" ]; then 1047
677 list2="$list2 $x/$file" 1048 # here is where we check for the licenses the user already
1049 # accepted ... if we don't find a match, we make the user accept
1050 local alic
1051 for alic in "${ACCEPT_LICENSE}" ; do
1052 [ "${alic}" == "*" ] && return 0
1053 [ "${alic}" == "${l}" ] && return 0
1054 done
1055
1056 local licmsg="`mymktemp ${T}`"
1057 cat << EOF > ${licmsg}
1058**********************************************************
1059The following license outlines the terms of use of this
1060package. You MUST accept this license for installation to
1061continue. When you are done viewing, hit 'q'. If you
1062CTRL+C out of this, the install will not run!
1063**********************************************************
1064
1065EOF
1066 cat ${lic} >> ${licmsg}
1067 ${PAGER:-less} ${licmsg} || die "Could not execute pager (${PAGER}) to accept ${lic}"
1068 einfon "Do you accept the terms of this license (${l})? [yes/no] "
1069 read alic
1070 case ${alic} in
1071 yes|Yes|y|Y)
1072 return 0
1073 ;;
1074 *)
1075 echo;echo;echo
1076 eerror "You MUST accept the license to continue! Exiting!"
1077 die "Failed to accept license"
1078 ;;
1079 esac
1080}
1081
1082# Aquire cd(s) for those lovely cd-based emerges. Yes, this violates
1083# the whole 'non-interactive' policy, but damnit I want CD support !
1084#
1085# with these cdrom functions we handle all the user interaction and
1086# standardize everything. all you have to do is call cdrom_get_cds()
1087# and when the function returns, you can assume that the cd has been
1088# found at CDROM_ROOT.
1089#
1090# normally the cdrom functions will refer to the cds as 'cd #1', 'cd #2',
1091# etc... if you want to give the cds better names, then just export
1092# the CDROM_NAME_X variables before calling cdrom_get_cds().
1093#
1094# for those multi cd ebuilds, see the cdrom_load_next_cd() below.
1095#
1096# Usage: cdrom_get_cds <file on cd1> [file on cd2] [file on cd3] [...]
1097# - this will attempt to locate a cd based upon a file that is on
1098# the cd ... the more files you give this function, the more cds
1099# the cdrom functions will handle
1100cdrom_get_cds() {
1101 # first we figure out how many cds we're dealing with by
1102 # the # of files they gave us
1103 local cdcnt=0
1104 local f=
1105 for f in "$@" ; do
1106 cdcnt=$((cdcnt + 1))
1107 export CDROM_CHECK_${cdcnt}="$f"
1108 done
1109 export CDROM_TOTAL_CDS=${cdcnt}
1110 export CDROM_CURRENT_CD=1
1111
1112 # now we see if the user gave use CD_ROOT ...
1113 # if they did, let's just believe them that it's correct
1114 if [ ! -z "${CD_ROOT}" ] ; then
1115 export CDROM_ROOT="${CD_ROOT}"
1116 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1117 return
1118 fi
1119 # do the same for CD_ROOT_X
1120 if [ ! -z "${CD_ROOT_1}" ] ; then
1121 local var=
1122 cdcnt=0
1123 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do
1124 cdcnt=$((cdcnt + 1))
1125 var="CD_ROOT_${cdcnt}"
1126 if [ -z "${!var}" ] ; then
1127 eerror "You must either use just the CD_ROOT"
1128 eerror "or specify ALL the CD_ROOT_X variables."
1129 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."
1130 die "could not locate CD_ROOT_${cdcnt}"
1131 fi
1132 export CDROM_ROOTS_${cdcnt}="${!var}"
1133 done
1134 export CDROM_ROOT=${CDROM_ROOTS_1}
1135 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1136 return
1137 fi
1138
1139 if [ ${CDROM_TOTAL_CDS} -eq 1 ] ; then
1140 einfon "This ebuild will need the "
1141 if [ -z "${CDROM_NAME}" ] ; then
1142 echo "cdrom for ${PN}."
1143 else
1144 echo "${CDROM_NAME}."
1145 fi
1146 echo
1147 einfo "If you do not have the CD, but have the data files"
1148 einfo "mounted somewhere on your filesystem, just export"
1149 einfo "the variable CD_ROOT so that it points to the"
1150 einfo "directory containing the files."
1151 echo
1152 else
1153 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1154 cdcnt=0
1155 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do
1156 cdcnt=$((cdcnt + 1))
1157 var="CDROM_NAME_${cdcnt}"
1158 [ ! -z "${!var}" ] && einfo " CD ${cdcnt}: ${!var}"
1159 done
1160 echo
1161 einfo "If you do not have the CDs, but have the data files"
1162 einfo "mounted somewhere on your filesystem, just export"
1163 einfo "the following variables so they point to the right place:"
1164 einfon ""
1165 cdcnt=0
1166 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do
1167 cdcnt=$((cdcnt + 1))
1168 echo -n " CD_ROOT_${cdcnt}"
1169 done
1170 echo
1171 einfo "Or, if you have all the files in the same place, or"
1172 einfo "you only have one cdrom, you can export CD_ROOT"
1173 einfo "and that place will be used as the same data source"
1174 einfo "for all the CDs."
1175 echo
1176 fi
1177 export CDROM_CURRENT_CD=0
1178 cdrom_load_next_cd
1179}
1180
1181# this is only used when you need access to more than one cd.
1182# when you have finished using the first cd, just call this function.
1183# when it returns, CDROM_ROOT will be pointing to the second cd.
1184# remember, you can only go forward in the cd chain, you can't go back.
1185cdrom_load_next_cd() {
1186 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1187 local var=
1188
1189 if [ ! -z "${CD_ROOT}" ] ; then
1190 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1191 return
1192 fi
1193
1194 unset CDROM_ROOT
1195 var=CDROM_ROOTS_${CDROM_CURRENT_CD}
1196 if [ -z "${!var}" ] ; then
1197 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1198 cdrom_locate_file_on_cd ${!var}
1199 else
1200 export CDROM_ROOT="${!var}"
1201 fi
1202
1203 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1204}
1205
1206# this is used internally by the cdrom_get_cds() and cdrom_load_next_cd()
1207# functions. this should *never* be called from an ebuild.
1208# all it does is try to locate a give file on a cd ... if the cd isn't
1209# found, then a message asking for the user to insert the cdrom will be
1210# displayed and we'll hang out here until:
1211# (1) the file is found on a mounted cdrom
1212# (2) the user hits CTRL+C
1213cdrom_locate_file_on_cd() {
1214 while [ -z "${CDROM_ROOT}" ] ; do
1215 local dir="$(dirname ${@})"
1216 local file="$(basename ${@})"
1217 local mline=""
1218 local showedmsg=0
1219
1220 for mline in `mount | egrep -e '(iso|cdrom)' | awk '{print $3}'` ; do
1221 [ -d "${mline}/${dir}" ] || continue
1222 [ ! -z "$(find ${mline}/${dir} -iname ${file} -maxdepth 1)" ] \
1223 && export CDROM_ROOT=${mline}
1224 done
1225
1226 if [ -z "${CDROM_ROOT}" ] ; then
1227 echo
1228 if [ ${showedmsg} -eq 0 ] ; then
1229 if [ ${CDROM_TOTAL_CDS} -eq 1 ] ; then
1230 if [ -z "${CDROM_NAME}" ] ; then
1231 einfo "Please insert the cdrom for ${PN} now !"
1232 else
1233 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1234 fi
1235 else
1236 if [ -z "${CDROM_NAME_1}" ] ; then
1237 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1238 else
1239 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1240 einfo "Please insert+mount the ${!var} cdrom now !"
1241 fi
1242 fi
1243 showedmsg=1
1244 fi
1245 einfo "Press return to scan for the cd again"
1246 einfo "or hit CTRL+C to abort the emerge."
1247 read
1248 fi
1249 done
1250}
1251
1252# Make sure that LINGUAS only contains languages that
1253# a package can support
1254#
1255# usage: strip-linguas <allow LINGUAS>
1256# strip-linguas -i <directories of .po files>
1257# strip-linguas -u <directories of .po files>
1258#
1259# The first form allows you to specify a list of LINGUAS.
1260# The -i builds a list of po files found in all the
1261# directories and uses the intersection of the lists.
1262# The -u builds a list of po files found in all the
1263# directories and uses the union of the lists.
1264strip-linguas() {
1265 local ls newls
1266 if [ "$1" == "-i" ] || [ "$1" == "-u" ] ; then
1267 local op="$1"; shift
1268 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift
1269 local d f
1270 for d in "$@" ; do
1271 if [ "${op}" == "-u" ] ; then
1272 newls="${ls}"
1273 else
1274 newls=""
1275 fi
1276 for f in $(find "$d" -name '*.po' -printf '%f ') ; do
1277 if [ "${op}" == "-i" ] ; then
1278 [ "${ls/ ${f} /}" != "${ls}" ] && newls="${newls} ${f}"
1279 else
1280 [ "${ls/ ${f} /}" == "${ls}" ] && newls="${newls} ${f}"
678 fi 1281 fi
679 done 1282 done
680 list="`echo $list2 | sort` $list" 1283 ls="${newls}"
1284 done
1285 ls="${ls//.po}"
1286 else
1287 ls="$@"
1288 fi
1289
1290 ls=" ${ls} "
1291 newls=""
1292 for f in ${LINGUAS} ; do
1293 if [ "${ls/ ${f} /}" != "${ls}" ] ; then
1294 nl="${newls} ${f}"
681 else 1295 else
682 die "Couldn't find $x" 1296 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA"
683 fi 1297 fi
684 done 1298 done
685 1299 if [ -z "${newls}" ] ; then
686 debug-print "$FUNCNAME: final list of patches: $list" 1300 unset LINGUAS
687 1301 else
688 for x in $list; do 1302 export LINGUAS="${newls}"
689 debug-print "$FUNCNAME: processing $x" 1303 fi
690 # deal with compressed files. /usr/bin/file is in the system profile, or should be.
691 case "`/usr/bin/file -b $x`" in
692 *gzip*) patchfile="${T}/current.patch"; ungzip -c "$x" > "${patchfile}";;
693 *bzip2*) patchfile="${T}/current.patch"; bunzip2 -c "$x" > "${patchfile}";;
694 *text*) patchfile="$x";;
695 *) die "Could not determine filetype of patch $x";;
696 esac
697 debug-print "$FUNCNAME: patchfile=$patchfile"
698
699 # determine patchlevel. supports p0 and higher with either $S or $WORKDIR as base.
700 target="`/bin/grep '+++' $patchfile | /usr/bin/tail -1`"
701 debug-print "$FUNCNAME: raw target=$target"
702 # strip target down to the path/filename. NOTE doesn't support filenames/paths with spaces in them :-(
703 # remove leading +++
704 target="${target/+++ }"
705 # ugly, yes. i dunno why doesn't this work instead: target=${target%% *}
706 for foo in $target; do target="$foo"; break; done
707 # duplicate slashes are discarded by patch wrt the patchlevel. therefore we need to discard them as well
708 # to calculate the correct patchlevel.
709 while [ "$target" != "${target/\/\/}" ]; do
710 target="${target/\/\//\/}"
711 done
712 debug-print "$FUNCNAME: stripped target=$target"
713
714 # look for target
715 for basedir in "$S" "$WORKDIR" "`pwd`"; do
716 debug-print "$FUNCNAME: looking in basedir=$basedir"
717 cd "$basedir"
718
719 # try stripping leading directories
720 target2="$target"
721 plevel=0
722 debug-print "$FUNCNAME: trying target2=$target2, plevel=$plevel"
723 while [ ! -f "$target2" ]; do
724 target2="${target2#*/}" # removes piece of target2 upto the first occurence of /
725 plevel=plevel+1
726 debug-print "$FUNCNAME: trying target2=$target2, plevel=$plevel"
727 [ "$target2" == "${target2/\/}" ] && break
728 done
729 test -f "$target2" && break
730
731 # try stripping filename - needed to support patches creating new files
732 target2="${target%/*}"
733 plevel=0
734 debug-print "$FUNCNAME: trying target2=$target2, plevel=$plevel"
735 while [ ! -d "$target2" ]; do
736 target2="${target2#*/}" # removes piece of target2 upto the first occurence of /
737 plevel=plevel+1
738 debug-print "$FUNCNAME: trying target2=$target2, plevel=$plevel"
739 [ "$target2" == "${target2/\/}" ] && break
740 done
741 test -d "$target2" && break
742
743 done
744
745 test -f "${basedir}/${target2}" || test -d "${basedir}/${target2}" || die "Could not determine patchlevel for $x"
746 debug-print "$FUNCNAME: determined plevel=$plevel"
747 # do the patching
748 ebegin "Applying patch ${x##*/}..."
749 /usr/bin/patch -p$plevel < "$patchfile" > /dev/null || die "Failed to apply patch $x"
750 eend $?
751
752 done
753
754} 1304}

Legend:
Removed from v.1.33  
changed lines
  Added in v.1.92

  ViewVC Help
Powered by ViewVC 1.1.20