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

Diff of /eclass/eutils.eclass

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

Revision 1.186 Revision 1.216
1# Copyright 1999-2005 Gentoo Foundation 1# Copyright 1999-2005 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.186 2005/07/06 20:20:03 agriffis Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.216 2005/11/09 05:57:17 mr_bones_ 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.
9# 9#
10# NB: If you add anything, please comment it! 10# NB: If you add anything, please comment it!
11 11
12inherit multilib 12inherit multilib portability
13INHERITED="$INHERITED $ECLASS"
14 13
15DEPEND="!bootstrap? ( sys-devel/patch )" 14DEPEND="!bootstrap? ( sys-devel/patch )"
16# sys-apps/shadow is needed for useradd, etc, bug #94745. 15# sys-apps/shadow is needed for useradd, etc, bug #94745.
17 16
18DESCRIPTION="Based on the ${ECLASS} eclass" 17DESCRIPTION="Based on the ${ECLASS} eclass"
68 dodir /usr/${libdir} 67 dodir /usr/${libdir}
69 68
70 for lib in "${@}" ; do 69 for lib in "${@}" ; do
71 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT 70 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT
72 /* GNU ld script 71 /* GNU ld script
73 Since Gentoo has critical dynamic libraries 72 Since Gentoo has critical dynamic libraries
74 in /lib, and the static versions in /usr/lib, 73 in /lib, and the static versions in /usr/lib,
75 we need to have a "fake" dynamic lib in /usr/lib, 74 we need to have a "fake" dynamic lib in /usr/lib,
76 otherwise we run into linking problems. 75 otherwise we run into linking problems.
77 76
78 See bug http://bugs.gentoo.org/4411 for more info. 77 See bug http://bugs.gentoo.org/4411 for more info.
79 */ 78 */
80 GROUP ( /${libdir}/${lib} ) 79 GROUP ( /${libdir}/${lib} )
81 END_LDSCRIPT 80 END_LDSCRIPT
82 fperms a+x "/usr/${libdir}/${lib}" 81 fperms a+x "/usr/${libdir}/${lib}"
167# hand its a directory, it will set EPATCH_SOURCE to this. 166# hand its a directory, it will set EPATCH_SOURCE to this.
168# 167#
169# <azarah@gentoo.org> (10 Nov 2002) 168# <azarah@gentoo.org> (10 Nov 2002)
170# 169#
171epatch() { 170epatch() {
171 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; }
172 local PIPE_CMD="" 172 local PIPE_CMD=""
173 local STDERR_TARGET="${T}/$$.out" 173 local STDERR_TARGET="${T}/$$.out"
174 local PATCH_TARGET="${T}/$$.patch" 174 local PATCH_TARGET="${T}/$$.patch"
175 local PATCH_SUFFIX="" 175 local PATCH_SUFFIX=""
176 local SINGLE_PATCH="no" 176 local SINGLE_PATCH="no"
177 local x="" 177 local x=""
178
179 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
178 180
179 if [ "$#" -gt 1 ] 181 if [ "$#" -gt 1 ]
180 then 182 then
181 local m="" 183 local m=""
182 for m in "$@" ; do 184 for m in "$@" ; do
312 count=5 314 count=5
313 break 315 break
314 fi 316 fi
315 fi 317 fi
316 318
317 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1 319 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f ; _epatch_assert) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
318 then 320 then
319 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 321 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
320 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 322 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
321 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 323 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
322 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 324 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
323 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 325 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
324 326
325 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1 327 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
328 _epatch_assert
326 329
327 if [ "$?" -ne 0 ] 330 if [ "$?" -ne 0 ]
328 then 331 then
329 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 332 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
330 echo 333 echo
376# vapier@gentoo.org 379# vapier@gentoo.org
377# 380#
378# Takes just 1 optional parameter (the directory to create tmpfile in) 381# Takes just 1 optional parameter (the directory to create tmpfile in)
379emktemp() { 382emktemp() {
380 local exe="touch" 383 local exe="touch"
381 [ "$1" == "-d" ] && exe="mkdir" && shift 384 [[ $1 == -d ]] && exe="mkdir" && shift
382 local topdir="$1" 385 local topdir=$1
383 386
384 if [ -z "${topdir}" ] 387 if [[ -z ${topdir} ]] ; then
385 then
386 [ -z "${T}" ] \ 388 [[ -z ${T} ]] \
387 && topdir="/tmp" \ 389 && topdir="/tmp" \
388 || topdir="${T}" 390 || topdir=${T}
389 fi 391 fi
390 392
391 if [ -z "$(type -p mktemp)" ] 393 if [[ -z $(type -p mktemp) ]] ; then
392 then
393 local tmp=/ 394 local tmp=/
394 while [ -e "${tmp}" ] ; do 395 while [[ -e ${tmp} ]] ; do
395 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 396 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
396 done 397 done
397 ${exe} "${tmp}" 398 ${exe} "${tmp}" || ${exe} -p "${tmp}"
398 echo "${tmp}" 399 echo "${tmp}"
399 else 400 else
400 [ "${exe}" == "touch" ] \ 401 [[ ${exe} == "touch" ]] \
401 && exe="-p" \ 402 && exe="-p" \
402 || exe="-d" 403 || exe="-d"
403 mktemp ${exe} "${topdir}" 404 mktemp ${exe} "${topdir}"
404 fi 405 fi
405} 406}
409# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 410# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
410# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 411# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
411# 412#
412# egetent(database, key) 413# egetent(database, key)
413egetent() { 414egetent() {
414 if [[ "${USERLAND}" == "Darwin" ]] ; then 415 case ${CHOST} in
416 *-darwin*)
415 case "$2" in 417 case "$2" in
416 *[!0-9]*) # Non numeric 418 *[!0-9]*) # Non numeric
417 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 419 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
418 ;; 420 ;;
419 *) # Numeric 421 *) # Numeric
420 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 422 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
421 ;; 423 ;;
422 esac 424 esac
423 elif [[ "${USERLAND}" == "BSD" ]] ; then 425 ;;
424 local action 426 *-freebsd*)
425 if [ "$1" == "passwd" ] 427 local opts action="user"
426 then 428 [[ $1 == "passwd" ]] || action="group"
427 action="user" 429
428 else 430 # lookup by uid/gid
429 action="group" 431 if [[ $2 == [[:digit:]]* ]] ; then
432 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
430 fi 433 fi
434
431 pw show "${action}" "$2" -q 435 pw show ${action} ${opts} "$2" -q
432 else 436 ;;
437 *-netbsd*)
438 grep "$2:\*:" /etc/$1
439 ;;
440 *)
433 which nscd >& /dev/null && nscd -i "$1" 441 type -p nscd >& /dev/null && nscd -i "$1"
434 getent "$1" "$2" 442 getent "$1" "$2"
435 fi 443 ;;
444 esac
436} 445}
437 446
438# Simplify/standardize adding users to the system 447# Simplify/standardize adding users to the system
439# vapier@gentoo.org 448# vapier@gentoo.org
440# 449#
478 fi 487 fi
479 else 488 else
480 euid="next" 489 euid="next"
481 fi 490 fi
482 if [[ ${euid} == "next" ]] ; then 491 if [[ ${euid} == "next" ]] ; then
483 local pwrange 492 for euid in $(seq 101 999) ; do
484 if [[ ${USERLAND} == "BSD" ]] ; then
485 pwrange=$(jot 898 101)
486 else
487 pwrange=$(seq 101 999)
488 fi
489 for euid in ${pwrange} ; do
490 [[ -z $(egetent passwd ${euid}) ]] && break 493 [[ -z $(egetent passwd ${euid}) ]] && break
491 done 494 done
492 fi 495 fi
493 opts="${opts} -u ${euid}" 496 opts="${opts} -u ${euid}"
494 einfo " - Userid: ${euid}" 497 einfo " - Userid: ${euid}"
499 if [[ ! -e ${eshell} ]] ; then 502 if [[ ! -e ${eshell} ]] ; then
500 eerror "A shell was specified but it does not exist !" 503 eerror "A shell was specified but it does not exist !"
501 die "${eshell} does not exist" 504 die "${eshell} does not exist"
502 fi 505 fi
503 else 506 else
504 case ${USERLAND} in 507 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
505 Darwin) eshell="/usr/bin/false";; 508 [[ -x ${ROOT}${shell} ]] && break
506 BSD) eshell="/usr/sbin/nologin";; 509 done
507 *) eshell="/bin/false";; 510
508 esac 511 if [[ ${shell} == "/dev/null" ]] ; then
512 eerror "Unable to identify the shell to use"
513 die "Unable to identify the shell to use"
514 fi
515
516 eshell=${shell}
509 fi 517 fi
510 einfo " - Shell: ${eshell}" 518 einfo " - Shell: ${eshell}"
511 opts="${opts} -s ${eshell}" 519 opts="${opts} -s ${eshell}"
512 520
513 # handle homedir 521 # handle homedir
550 einfo " - Groups: ${egroups}" 558 einfo " - Groups: ${egroups}"
551 559
552 # handle extra and add the user 560 # handle extra and add the user
553 local oldsandbox=${SANDBOX_ON} 561 local oldsandbox=${SANDBOX_ON}
554 export SANDBOX_ON="0" 562 export SANDBOX_ON="0"
555 case ${USERLAND} in 563 case ${CHOST} in
556 Darwin) 564 *-darwin*)
557 ### Make the user 565 ### Make the user
558 if [[ -z $@ ]] ; then 566 if [[ -z $@ ]] ; then
559 dscl . create /users/${euser} uid ${euid} 567 dscl . create /users/${euser} uid ${euid}
560 dscl . create /users/${euser} shell ${eshell} 568 dscl . create /users/${euser} shell ${eshell}
561 dscl . create /users/${euser} home ${ehome} 569 dscl . create /users/${euser} home ${ehome}
572 einfo "Please report the ebuild along with the info below" 580 einfo "Please report the ebuild along with the info below"
573 einfo "eextra: $@" 581 einfo "eextra: $@"
574 die "Required function missing" 582 die "Required function missing"
575 fi 583 fi
576 ;; 584 ;;
577 BSD) 585 *-freebsd*)
578 if [[ -z $@ ]] ; then 586 if [[ -z $@ ]] ; then
579 pw useradd ${euser} ${opts} \ 587 pw useradd ${euser} ${opts} \
580 -c "added by portage for ${PN}" \ 588 -c "added by portage for ${PN}" \
581 die "enewuser failed" 589 die "enewuser failed"
582 else 590 else
583 einfo " - Extra: $@" 591 einfo " - Extra: $@"
584 pw useradd ${euser} ${opts} \ 592 pw useradd ${euser} ${opts} \
585 "$@" || die "enewuser failed" 593 "$@" || die "enewuser failed"
594 fi
595 ;;
596
597 *-netbsd*)
598 if [[ -z $@ ]] ; then
599 useradd ${opts} ${euser} || die "enewuser failed"
600 else
601 einfo " - Extra: $@"
602 useradd ${opts} ${euser} "$@" || die "enewuser failed"
586 fi 603 fi
587 ;; 604 ;;
588 *) 605 *)
589 if [[ -z $@ ]] ; then 606 if [[ -z $@ ]] ; then
590 useradd ${opts} ${euser} \ 607 useradd ${opts} ${euser} \
595 useradd ${opts} ${euser} "$@" \ 612 useradd ${opts} ${euser} "$@" \
596 || die "enewuser failed" 613 || die "enewuser failed"
597 fi 614 fi
598 ;; 615 ;;
599 esac 616 esac
617
618 if [[ ! -e ${ROOT}/${ehome} ]] ; then
619 einfo " - Creating ${ehome} in ${ROOT}"
620 mkdir -p "${ROOT}/${ehome}"
621 chown ${euser} "${ROOT}/${ehome}"
622 chmod 755 "${ROOT}/${ehome}"
623 fi
624
600 export SANDBOX_ON=${oldsandbox} 625 export SANDBOX_ON=${oldsandbox}
601
602 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ]
603 then
604 einfo " - Creating ${ehome} in ${D}"
605 dodir ${ehome}
606 fowners ${euser} ${ehome}
607 fperms 755 ${ehome}
608 fi
609} 626}
610 627
611# Simplify/standardize adding groups to the system 628# Simplify/standardize adding groups to the system
612# vapier@gentoo.org 629# vapier@gentoo.org
613# 630#
642 then 659 then
643 if [ "${egid}" -gt 0 ] 660 if [ "${egid}" -gt 0 ]
644 then 661 then
645 if [ -z "`egetent group ${egid}`" ] 662 if [ -z "`egetent group ${egid}`" ]
646 then 663 then
647 if [[ "${USERLAND}" == "Darwin" ]]; then 664 if [[ "${CHOST}" == *-darwin* ]]; then
648 opts="${opts} ${egid}" 665 opts="${opts} ${egid}"
649 else 666 else
650 opts="${opts} -g ${egid}" 667 opts="${opts} -g ${egid}"
651 fi 668 fi
652 else 669 else
666 opts="${opts} ${eextra}" 683 opts="${opts} ${eextra}"
667 684
668 # add the group 685 # add the group
669 local oldsandbox="${SANDBOX_ON}" 686 local oldsandbox="${SANDBOX_ON}"
670 export SANDBOX_ON="0" 687 export SANDBOX_ON="0"
671 if [[ "${USERLAND}" == "Darwin" ]]; then 688 case ${CHOST} in
689 *-darwin*)
672 if [ ! -z "${eextra}" ]; 690 if [ ! -z "${eextra}" ];
673 then 691 then
674 einfo "Extra options are not supported on Darwin/OS X yet" 692 einfo "Extra options are not supported on Darwin/OS X yet"
675 einfo "Please report the ebuild along with the info below" 693 einfo "Please report the ebuild along with the info below"
676 einfo "eextra: ${eextra}" 694 einfo "eextra: ${eextra}"
677 die "Required function missing" 695 die "Required function missing"
678 fi 696 fi
679 697
680 # If we need the next available 698 # If we need the next available
681 case ${egid} in 699 case ${egid} in
682 *[!0-9]*) # Non numeric 700 *[!0-9]*) # Non numeric
683 for egid in `jot 898 101`; do 701 for egid in $(seq 101 999); do
684 [ -z "`egetent group ${egid}`" ] && break 702 [ -z "`egetent group ${egid}`" ] && break
685 done 703 done
686 esac 704 esac
687 dscl . create /groups/${egroup} gid ${egid} 705 dscl . create /groups/${egroup} gid ${egid}
688 dscl . create /groups/${egroup} passwd '*' 706 dscl . create /groups/${egroup} passwd '*'
689 elif [[ "${USERLAND}" == "BSD" ]] ; then 707 ;;
708
709 *-freebsd*)
690 case ${egid} in 710 case ${egid} in
691 *[!0-9]*) # Non numeric 711 *[!0-9]*) # Non numeric
692 for egid in `jot 898 101`; do 712 for egid in $(seq 101 999); do
693 [ -z "`egetent group ${egid}`" ] && break 713 [ -z "`egetent group ${egid}`" ] && break
694 done 714 done
695 esac 715 esac
696 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 716 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
697 else 717 ;;
718
719 *-netbsd*)
720 case ${egid} in
721 *[!0-9]*) # Non numeric
722 for egid in $(seq 101 999); do
723 [ -z "`egetent group ${egid}`" ] && break
724 done
725 esac
726 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
727 ;;
728
729 *)
698 groupadd ${opts} ${egroup} || die "enewgroup failed" 730 groupadd ${opts} ${egroup} || die "enewgroup failed"
699 fi 731 ;;
732 esac
700 export SANDBOX_ON="${oldsandbox}" 733 export SANDBOX_ON="${oldsandbox}"
701} 734}
702 735
703# Simple script to replace 'dos2unix' binaries 736# Simple script to replace 'dos2unix' binaries
704# vapier@gentoo.org 737# vapier@gentoo.org
729# name: the name that will show up in the menu 762# name: the name that will show up in the menu
730# icon: give your little like a pretty little icon ... 763# icon: give your little like a pretty little icon ...
731# this can be relative (to /usr/share/pixmaps) or 764# this can be relative (to /usr/share/pixmaps) or
732# a full path to an icon 765# a full path to an icon
733# type: what kind of application is this ? for categories: 766# type: what kind of application is this ? for categories:
734# http://www.freedesktop.org/wiki/Standards_2fmenu_2dspec 767# http://www.freedesktop.org/Standards/desktop-entry-spec
735# path: if your app needs to startup in a specific dir 768# path: if your app needs to startup in a specific dir
736make_desktop_entry() { 769make_desktop_entry() {
737 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1 770 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
738 771
739 local exec=${1} 772 local exec=${1}
765 dev) 798 dev)
766 type="Development" 799 type="Development"
767 ;; 800 ;;
768 801
769 games) 802 games)
770 [[ -z ${path} ]] && path=${GAMES_BINDIR}
771
772 case ${catmin} in 803 case ${catmin} in
773 action) type=ActionGame;; 804 action) type=ActionGame;;
774 arcade) type=ArcadeGame;; 805 arcade) type=ArcadeGame;;
775 board) type=BoardGame;; 806 board) type=BoardGame;;
776 kid) type=KidsGame;; 807 kid) type=KidsGame;;
817 type="Network;${type}" 848 type="Network;${type}"
818 ;; 849 ;;
819 850
820 sci) 851 sci)
821 case ${catmin} in 852 case ${catmin} in
822 astro*) type=Astronomoy;; 853 astro*) type=Astronomy;;
823 bio*) type=Biology;; 854 bio*) type=Biology;;
824 calc*) type=Calculator;; 855 calc*) type=Calculator;;
825 chem*) type=Chemistry;; 856 chem*) type=Chemistry;;
826 geo*) type=Geology;; 857 geo*) type=Geology;;
827 math*) type=Math;; 858 math*) type=Math;;
859Exec=${exec} 890Exec=${exec}
860Path=${path} 891Path=${path}
861Icon=${icon} 892Icon=${icon}
862Categories=Application;${type};" > "${desktop}" 893Categories=Application;${type};" > "${desktop}"
863 894
895 (
896 # wrap the env here so that the 'insinto' call
897 # doesn't corrupt the env of the caller
864 insinto /usr/share/applications 898 insinto /usr/share/applications
865 doins "${desktop}" 899 doins "${desktop}"
866 900 )
867 return 0
868} 901}
869 902
870# Make a GDM/KDM Session file 903# Make a GDM/KDM Session file
871# 904#
872# make_desktop_entry(<title>, <command>) 905# make_desktop_entry(<title>, <command>)
901 doins "${i}" 934 doins "${i}"
902 elif [[ -d ${i} ]] ; then 935 elif [[ -d ${i} ]] ; then
903 for j in "${i}"/*.desktop ; do 936 for j in "${i}"/*.desktop ; do
904 doins "${j}" 937 doins "${j}"
905 done 938 done
906 fi 939 fi
907 done 940 done
908} 941}
909newmenu() { 942newmenu() {
910 insinto /usr/share/applications 943 insinto /usr/share/applications
911 newins "$1" "$2" 944 newins "$1" "$2"
919 doins "${i}" 952 doins "${i}"
920 elif [[ -d ${i} ]] ; then 953 elif [[ -d ${i} ]] ; then
921 for j in "${i}"/*.png ; do 954 for j in "${i}"/*.png ; do
922 doins "${j}" 955 doins "${j}"
923 done 956 done
924 fi 957 fi
925 done 958 done
926} 959}
927newicon() { 960newicon() {
928 insinto /usr/share/pixmaps 961 insinto /usr/share/pixmaps
929 newins "$1" "$2" 962 newins "$1" "$2"
934############################################################## 967##############################################################
935 968
936 969
937# for internal use only (unpack_pdv and unpack_makeself) 970# for internal use only (unpack_pdv and unpack_makeself)
938find_unpackable_file() { 971find_unpackable_file() {
939 local src="$1" 972 local src=$1
940 if [ -z "${src}" ] 973 if [[ -z ${src} ]] ; then
941 then
942 src="${DISTDIR}/${A}" 974 src=${DISTDIR}/${A}
943 else 975 else
944 if [ -e "${DISTDIR}/${src}" ] 976 if [[ -e ${DISTDIR}/${src} ]] ; then
945 then
946 src="${DISTDIR}/${src}" 977 src=${DISTDIR}/${src}
947 elif [ -e "${PWD}/${src}" ] 978 elif [[ -e ${PWD}/${src} ]] ; then
948 then
949 src="${PWD}/${src}" 979 src=${PWD}/${src}
950 elif [ -e "${src}" ] 980 elif [[ -e ${src} ]] ; then
951 then
952 src="${src}" 981 src=${src}
953 fi
954 fi 982 fi
955 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 983 fi
984 [[ ! -e ${src} ]] && return 1
956 echo "${src}" 985 echo "${src}"
957} 986}
958 987
959# Unpack those pesky pdv generated files ... 988# Unpack those pesky pdv generated files ...
960# They're self-unpacking programs with the binary package stuffed in 989# They're self-unpacking programs with the binary package stuffed in
975# lseek 1004# lseek
976# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1005# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
977# lseek(3, -4, SEEK_END) = 2981250 1006# lseek(3, -4, SEEK_END) = 2981250
978# thus we would pass in the value of '4' as the second parameter. 1007# thus we would pass in the value of '4' as the second parameter.
979unpack_pdv() { 1008unpack_pdv() {
980 local src="`find_unpackable_file $1`" 1009 local src=$(find_unpackable_file $1)
981 local sizeoff_t="$2" 1010 local sizeoff_t=$2
982 1011
1012 [[ -z ${src} ]] && die "Could not locate source for '$1'"
983 [ -z "${sizeoff_t}" ] && die "No idea what off_t size was used for this pdv :(" 1013 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
984 1014
985 local shrtsrc="`basename ${src}`" 1015 local shrtsrc=$(basename "${src}")
986 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1016 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
987 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1017 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
988 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"` 1018 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
989 1019
990 # grab metadata for debug reasons 1020 # grab metadata for debug reasons
1054# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1084# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1055# - If the file is not specified then unpack will utilize ${A}. 1085# - If the file is not specified then unpack will utilize ${A}.
1056# - If the offset is not specified then we will attempt to extract 1086# - If the offset is not specified then we will attempt to extract
1057# the proper offset from the script itself. 1087# the proper offset from the script itself.
1058unpack_makeself() { 1088unpack_makeself() {
1059 local src="$(find_unpackable_file "$1")" 1089 local src=$(find_unpackable_file "$1")
1060 local skip="$2" 1090 local skip=$2
1061 local exe="$3" 1091 local exe=$3
1062 1092
1093 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1094
1063 local shrtsrc="$(basename "${src}")" 1095 local shrtsrc=$(basename "${src}")
1064 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1096 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1065 if [ -z "${skip}" ] 1097 if [[ -z ${skip} ]] ; then
1066 then
1067 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1098 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1068 local skip=0 1099 local skip=0
1069 exe=tail 1100 exe=tail
1070 case ${ver} in 1101 case ${ver} in
1071 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1102 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
1072 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1103 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1084 ;; 1115 ;;
1085 2.1.3) 1116 2.1.3)
1086 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1117 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1087 let skip="skip + 1" 1118 let skip="skip + 1"
1088 ;; 1119 ;;
1089 2.1.4) 1120 2.1.4|2.1.5)
1090 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1) 1121 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
1091 skip=$(head -n ${skip} "${src}" | wc -c) 1122 skip=$(head -n ${skip} "${src}" | wc -c)
1092 exe="dd" 1123 exe="dd"
1093 ;; 1124 ;;
1094 *) 1125 *)
1139check_license() { 1170check_license() {
1140 local lic=$1 1171 local lic=$1
1141 if [ -z "${lic}" ] ; then 1172 if [ -z "${lic}" ] ; then
1142 lic="${PORTDIR}/licenses/${LICENSE}" 1173 lic="${PORTDIR}/licenses/${LICENSE}"
1143 else 1174 else
1144 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1175 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1145 lic="${PORTDIR}/licenses/${src}" 1176 lic="${PORTDIR}/licenses/${lic}"
1146 elif [ -e "${PWD}/${src}" ] ; then 1177 elif [ -e "${PWD}/${lic}" ] ; then
1147 lic="${PWD}/${src}" 1178 lic="${PWD}/${lic}"
1148 elif [ -e "${src}" ] ; then 1179 elif [ -e "${lic}" ] ; then
1149 lic="${src}" 1180 lic="${lic}"
1150 fi
1151 fi 1181 fi
1182 fi
1152 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1183 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1153 local l="`basename ${lic}`" 1184 local l="`basename ${lic}`"
1154 1185
1155 # here is where we check for the licenses the user already 1186 # here is where we check for the licenses the user already
1156 # accepted ... if we don't find a match, we make the user accept 1187 # accepted ... if we don't find a match, we make the user accept
1157 local shopts=$- 1188 local shopts=$-
1213 # first we figure out how many cds we're dealing with by 1244 # first we figure out how many cds we're dealing with by
1214 # the # of files they gave us 1245 # the # of files they gave us
1215 local cdcnt=0 1246 local cdcnt=0
1216 local f= 1247 local f=
1217 for f in "$@" ; do 1248 for f in "$@" ; do
1218 cdcnt=$((cdcnt + 1)) 1249 ((++cdcnt))
1219 export CDROM_CHECK_${cdcnt}="$f" 1250 export CDROM_CHECK_${cdcnt}="$f"
1220 done 1251 done
1221 export CDROM_TOTAL_CDS=${cdcnt} 1252 export CDROM_TOTAL_CDS=${cdcnt}
1222 export CDROM_CURRENT_CD=1 1253 export CDROM_CURRENT_CD=1
1223 1254
1224 # now we see if the user gave use CD_ROOT ... 1255 # now we see if the user gave use CD_ROOT ...
1225 # if they did, let's just believe them that it's correct 1256 # if they did, let's just believe them that it's correct
1226 if [[ ! -z ${CD_ROOT} ]] ; then
1227 export CDROM_ROOT=${CD_ROOT}
1228 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1229 return
1230 fi
1231 # do the same for CD_ROOT_X
1232 if [[ ! -z ${CD_ROOT_1} ]] ; then 1257 if [[ -n ${CD_ROOT}${CD_ROOT_1} ]] ; then
1233 local var= 1258 local var=
1234 cdcnt=0 1259 cdcnt=0
1235 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1260 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1236 cdcnt=$((cdcnt + 1)) 1261 ((++cdcnt))
1237 var="CD_ROOT_${cdcnt}" 1262 var="CD_ROOT_${cdcnt}"
1263 [[ -z ${!var} ]] && var="CD_ROOT"
1238 if [[ -z ${!var} ]] ; then 1264 if [[ -z ${!var} ]] ; then
1239 eerror "You must either use just the CD_ROOT" 1265 eerror "You must either use just the CD_ROOT"
1240 eerror "or specify ALL the CD_ROOT_X variables." 1266 eerror "or specify ALL the CD_ROOT_X variables."
1241 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables." 1267 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."
1242 die "could not locate CD_ROOT_${cdcnt}" 1268 die "could not locate CD_ROOT_${cdcnt}"
1243 fi 1269 fi
1244 export CDROM_ROOTS_${cdcnt}="${!var}"
1245 done 1270 done
1246 export CDROM_ROOT=${CDROM_ROOTS_1} 1271 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1247 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1272 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1273 export CDROM_SET=-1
1274 for f in ${CDROM_CHECK_1//:/ } ; do
1275 ((++CDROM_SET))
1276 [[ -e ${CD_ROOT}/${f} ]] && break
1277 done
1278 export CDROM_MATCH=${f}
1248 return 1279 return
1249 fi 1280 fi
1250 1281
1282 # User didn't help us out so lets make sure they know they can
1283 # simplify the whole process ...
1251 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1284 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1252 einfon "This ebuild will need the " 1285 einfo "This ebuild will need the ${CDROM_NAME:-cdrom for ${PN}}"
1253 if [[ -z ${CDROM_NAME} ]] ; then
1254 echo "cdrom for ${PN}."
1255 else
1256 echo "${CDROM_NAME}."
1257 fi
1258 echo 1286 echo
1259 einfo "If you do not have the CD, but have the data files" 1287 einfo "If you do not have the CD, but have the data files"
1260 einfo "mounted somewhere on your filesystem, just export" 1288 einfo "mounted somewhere on your filesystem, just export"
1261 einfo "the variable CD_ROOT so that it points to the" 1289 einfo "the variable CD_ROOT so that it points to the"
1262 einfo "directory containing the files." 1290 einfo "directory containing the files."
1266 echo 1294 echo
1267 else 1295 else
1268 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1296 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1269 cdcnt=0 1297 cdcnt=0
1270 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1298 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1271 cdcnt=$((cdcnt + 1)) 1299 ((++cdcnt))
1272 var="CDROM_NAME_${cdcnt}" 1300 var="CDROM_NAME_${cdcnt}"
1273 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}" 1301 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1274 done 1302 done
1275 echo 1303 echo
1276 einfo "If you do not have the CDs, but have the data files" 1304 einfo "If you do not have the CDs, but have the data files"
1277 einfo "mounted somewhere on your filesystem, just export" 1305 einfo "mounted somewhere on your filesystem, just export"
1278 einfo "the following variables so they point to the right place:" 1306 einfo "the following variables so they point to the right place:"
1279 einfon "" 1307 einfon ""
1280 cdcnt=0 1308 cdcnt=0
1281 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1309 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1282 cdcnt=$((cdcnt + 1)) 1310 ((++cdcnt))
1283 echo -n " CD_ROOT_${cdcnt}" 1311 echo -n " CD_ROOT_${cdcnt}"
1284 done 1312 done
1285 echo 1313 echo
1286 einfo "Or, if you have all the files in the same place, or" 1314 einfo "Or, if you have all the files in the same place, or"
1287 einfo "you only have one cdrom, you can export CD_ROOT" 1315 einfo "you only have one cdrom, you can export CD_ROOT"
1290 echo 1318 echo
1291 einfo "For example:" 1319 einfo "For example:"
1292 einfo "export CD_ROOT_1=/mnt/cdrom" 1320 einfo "export CD_ROOT_1=/mnt/cdrom"
1293 echo 1321 echo
1294 fi 1322 fi
1323
1324 export CDROM_SET=""
1295 export CDROM_CURRENT_CD=0 1325 export CDROM_CURRENT_CD=0
1296 cdrom_load_next_cd 1326 cdrom_load_next_cd
1297} 1327}
1298 1328
1299# this is only used when you need access to more than one cd. 1329# this is only used when you need access to more than one cd.
1300# when you have finished using the first cd, just call this function. 1330# when you have finished using the first cd, just call this function.
1301# when it returns, CDROM_ROOT will be pointing to the second cd. 1331# when it returns, CDROM_ROOT will be pointing to the second cd.
1302# remember, you can only go forward in the cd chain, you can't go back. 1332# remember, you can only go forward in the cd chain, you can't go back.
1303cdrom_load_next_cd() { 1333cdrom_load_next_cd() {
1304 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1305 local var= 1334 local var
1306 1335 ((++CDROM_CURRENT_CD))
1307 if [[ ! -z ${CD_ROOT} ]] ; then
1308 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1309 return
1310 fi
1311 1336
1312 unset CDROM_ROOT 1337 unset CDROM_ROOT
1313 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1338 var=CD_ROOT_${CDROM_CURRENT_CD}
1339 [[ -z ${!var} ]] && var="CD_ROOT"
1314 if [[ -z ${!var} ]] ; then 1340 if [[ -z ${!var} ]] ; then
1315 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1341 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1316 cdrom_locate_file_on_cd ${!var} 1342 _cdrom_locate_file_on_cd ${!var}
1317 else 1343 else
1318 export CDROM_ROOT=${!var} 1344 export CDROM_ROOT=${!var}
1319 fi 1345 fi
1320 1346
1321 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1347 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1326# all it does is try to locate a give file on a cd ... if the cd isn't 1352# all it does is try to locate a give file on a cd ... if the cd isn't
1327# found, then a message asking for the user to insert the cdrom will be 1353# found, then a message asking for the user to insert the cdrom will be
1328# displayed and we'll hang out here until: 1354# displayed and we'll hang out here until:
1329# (1) the file is found on a mounted cdrom 1355# (1) the file is found on a mounted cdrom
1330# (2) the user hits CTRL+C 1356# (2) the user hits CTRL+C
1331cdrom_locate_file_on_cd() { 1357_cdrom_locate_file_on_cd() {
1358 local mline=""
1359 local showedmsg=0
1360
1332 while [[ -z ${CDROM_ROOT} ]] ; do 1361 while [[ -z ${CDROM_ROOT} ]] ; do
1362 local i=0
1363 local -a cdset=(${*//:/ })
1364 if [[ -n ${CDROM_SET} ]] ; then
1365 cdset=(${cdset[${CDROM_SET}]})
1366 fi
1367
1368 while [[ -n ${cdset[${i}]} ]] ; do
1333 local dir="$(dirname ${@})" 1369 local dir=$(dirname ${cdset[${i}]})
1334 local file="$(basename ${@})" 1370 local file=$(basename ${cdset[${i}]})
1335 local mline=""
1336 local showedmsg=0
1337 1371
1338 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1372 for mline in $(mount | gawk '/(iso|cdrom|fs=cdfss)/ {print $3}') ; do
1339 [[ -d ${mline}/${dir} ]] || continue 1373 [[ -d ${mline}/${dir} ]] || continue
1340 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \ 1374 if [[ -n $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] ; then
1341 && export CDROM_ROOT=${mline} 1375 export CDROM_ROOT=${mline}
1376 export CDROM_SET=${i}
1377 export CDROM_MATCH=${cdset[${i}]}
1378 return
1379 fi
1380 done
1381
1382 ((++i))
1342 done 1383 done
1343 1384
1344 if [[ -z ${CDROM_ROOT} ]] ; then
1345 echo 1385 echo
1346 if [[ ${showedmsg} -eq 0 ]] ; then 1386 if [[ ${showedmsg} -eq 0 ]] ; then
1347 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1387 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1348 if [[ -z ${CDROM_NAME} ]] ; then 1388 if [[ -z ${CDROM_NAME} ]] ; then
1349 einfo "Please insert the cdrom for ${PN} now !" 1389 einfo "Please insert+mount the cdrom for ${PN} now !"
1350 else
1351 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1352 fi
1353 else 1390 else
1354 if [[ -z ${CDROM_NAME_1} ]] ; then
1355 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1356 else
1357 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1358 einfo "Please insert+mount the ${!var} cdrom now !" 1391 einfo "Please insert+mount the ${CDROM_NAME} cdrom now !"
1359 fi
1360 fi 1392 fi
1361 showedmsg=1 1393 else
1394 if [[ -z ${CDROM_NAME_1} ]] ; then
1395 einfo "Please insert+mount cd #${CDROM_CURRENT_CD} for ${PN} now !"
1396 else
1397 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1398 einfo "Please insert+mount the ${!var} cdrom now !"
1399 fi
1362 fi 1400 fi
1401 showedmsg=1
1402 fi
1363 einfo "Press return to scan for the cd again" 1403 einfo "Press return to scan for the cd again"
1364 einfo "or hit CTRL+C to abort the emerge." 1404 einfo "or hit CTRL+C to abort the emerge."
1365 echo 1405 echo
1366 einfo "If you are having trouble with the detection" 1406 einfo "If you are having trouble with the detection"
1367 einfo "of your CD, it is possible that you do not have" 1407 einfo "of your CD, it is possible that you do not have"
1368 einfo "Joliet support enabled in your kernel. Please" 1408 einfo "Joliet support enabled in your kernel. Please"
1369 einfo "check that CONFIG_JOLIET is enabled in your kernel." 1409 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1370 read 1410 read
1371 fi
1372 done 1411 done
1373} 1412}
1374 1413
1375# Make sure that LINGUAS only contains languages that 1414# Make sure that LINGUAS only contains languages that
1376# a package can support 1415# a package can support
1497 LIB=$1 1536 LIB=$1
1498 1537
1499 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1538 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1500 SONAME=`basename ${LIB}` 1539 SONAME=`basename ${LIB}`
1501 1540
1502 einfo "An old version of an installed library was detected on your system." 1541 ewarn "An old version of an installed library was detected on your system."
1503 einfo "In order to avoid breaking packages that link against it, this older version" 1542 ewarn "In order to avoid breaking packages that link against it, this older version"
1504 einfo "is not being removed. In order to make full use of this newer version," 1543 ewarn "is not being removed. In order to make full use of this newer version,"
1505 einfo "you will need to execute the following command:" 1544 ewarn "you will need to execute the following command:"
1506 einfo " revdep-rebuild --soname ${SONAME}" 1545 ewarn " revdep-rebuild --soname ${SONAME}"
1507 einfo 1546 ewarn
1508 einfo "After doing that, you can safely remove ${LIB}" 1547 ewarn "After doing that, you can safely remove ${LIB}"
1509 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1548 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1510 fi 1549 fi
1511} 1550}
1512 1551
1513# Hack for people to figure out if a package was built with 1552# Hack for people to figure out if a package was built with
1514# certain USE flags 1553# certain USE flags
1524 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1563 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1525 1564
1526 local PKG=$(best_version $1) 1565 local PKG=$(best_version $1)
1527 shift 1566 shift
1528 1567
1529 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE" 1568 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
1569
1570 # if the USE file doesnt exist, assume the $PKG is either
1571 # injected or package.provided
1530 [[ ! -e ${USEFILE} ]] && return 1 1572 [[ ! -e ${USEFILE} ]] && return 0
1531 1573
1532 local USE_BUILT=$(<${USEFILE}) 1574 local USE_BUILT=$(<${USEFILE})
1533 while [[ $# -gt 0 ]] ; do 1575 while [[ $# -gt 0 ]] ; do
1534 if [[ ${opt} = "-o" ]] ; then 1576 if [[ ${opt} = "-o" ]] ; then
1535 has $1 ${USE_BUILT} && return 0 1577 has $1 ${USE_BUILT} && return 0
1587# $4 == extra LD_LIBRARY_PATH's (make it : delimited) 1629# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1588# $5 == path for wrapper 1630# $5 == path for wrapper
1589make_wrapper() { 1631make_wrapper() {
1590 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5 1632 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1591 local tmpwrapper=$(emktemp) 1633 local tmpwrapper=$(emktemp)
1634 # We don't want to quote ${bin} so that people can pass complex
1635 # things as $bin ... "./someprog --args"
1592 cat << EOF > "${tmpwrapper}" 1636 cat << EOF > "${tmpwrapper}"
1593#!/bin/sh 1637#!/bin/sh
1594cd "${chdir}" 1638cd "${chdir:-.}"
1639if [ -n "${libdir}" ] ; then
1640 if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
1595export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}" 1641 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1642 else
1643 export LD_LIBRARY_PATH="${libdir}"
1644 fi
1645fi
1596exec ${bin} "\$@" 1646exec ${bin} "\$@"
1597EOF 1647EOF
1598 chmod go+rx "${tmpwrapper}" 1648 chmod go+rx "${tmpwrapper}"
1599 if [ -n "${5}" ] 1649 if [[ -n ${path} ]] ; then
1600 then
1601 exeinto ${5} 1650 exeinto "${path}"
1602 newexe "${tmpwrapper}" "${wrapper}" 1651 newexe "${tmpwrapper}" "${wrapper}"
1603 else 1652 else
1604 newbin "${tmpwrapper}" "${wrapper}" 1653 newbin "${tmpwrapper}" "${wrapper}"
1605 fi 1654 fi
1606} 1655}

Legend:
Removed from v.1.186  
changed lines
  Added in v.1.216

  ViewVC Help
Powered by ViewVC 1.1.20