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

Diff of /eclass/eutils.eclass

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

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

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

  ViewVC Help
Powered by ViewVC 1.1.20