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

Diff of /eclass/eutils.eclass

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

Revision 1.193 Revision 1.220
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.193 2005/07/21 02:16:45 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.220 2005/12/13 14:08:29 flameeyes 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
13 13
14DEPEND="!bootstrap? ( sys-devel/patch )" 14DEPEND="!bootstrap? ( sys-devel/patch )"
15# sys-apps/shadow is needed for useradd, etc, bug #94745. 15# sys-apps/shadow is needed for useradd, etc, bug #94745.
16 16
17DESCRIPTION="Based on the ${ECLASS} eclass" 17DESCRIPTION="Based on the ${ECLASS} eclass"
60# to point to the latest version of the library present. 60# to point to the latest version of the library present.
61# 61#
62# <azarah@gentoo.org> (26 Oct 2002) 62# <azarah@gentoo.org> (26 Oct 2002)
63# 63#
64gen_usr_ldscript() { 64gen_usr_ldscript() {
65 local libdir="$(get_libdir)" 65 local lib libdir=$(get_libdir)
66 # Just make sure it exists 66 # Just make sure it exists
67 dodir /usr/${libdir} 67 dodir /usr/${libdir}
68 68
69 for lib in "${@}" ; do 69 for lib in "${@}" ; do
70 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT 70 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT
76 76
77 See bug http://bugs.gentoo.org/4411 for more info. 77 See bug http://bugs.gentoo.org/4411 for more info.
78 */ 78 */
79 GROUP ( /${libdir}/${lib} ) 79 GROUP ( /${libdir}/${lib} )
80 END_LDSCRIPT 80 END_LDSCRIPT
81 fperms a+x "/usr/${libdir}/${lib}" 81 fperms a+x "/usr/${libdir}/${lib}" || die "could not change perms on ${lib}"
82 done 82 done
83} 83}
84 84
85# Simple function to draw a line consisting of '=' the same length as $*
86# - only to be used by epatch()
87#
88# <azarah@gentoo.org> (11 Nov 2002)
89#
90draw_line() {
91 local i=0
92 local str_length=""
93
94 # Handle calls that do not have args, or wc not being installed ...
95 if [ -z "$1" -o ! -x "$(which wc 2>/dev/null)" ]
96 then
97 echo "==============================================================="
98 return 0
99 fi
100
101 # Get the length of $*
102 str_length="$(echo -n "$*" | wc -m)"
103
104 while [ "$i" -lt "${str_length}" ]
105 do
106 echo -n "="
107
108 i=$((i + 1))
109 done
110
111 echo
112
113 return 0
114}
115 85
116# Default directory where patches are located 86# Default directory where patches are located
117EPATCH_SOURCE="${WORKDIR}/patch" 87EPATCH_SOURCE="${WORKDIR}/patch"
118# Default extension for patches 88# Default extension for patches
119EPATCH_SUFFIX="patch.bz2" 89EPATCH_SUFFIX="patch.bz2"
166# hand its a directory, it will set EPATCH_SOURCE to this. 136# hand its a directory, it will set EPATCH_SOURCE to this.
167# 137#
168# <azarah@gentoo.org> (10 Nov 2002) 138# <azarah@gentoo.org> (10 Nov 2002)
169# 139#
170epatch() { 140epatch() {
141 _epatch_draw_line() {
142 local i=0 str_length="" str_out=""
143
144 # Handle calls that do not have args, or wc not being installed ...
145 if [[ -z $1 ]] || ! type -p wc >/dev/null ; then
146 str_length=65
147 else
148 str_length=$(echo -n "$*" | wc -m)
149 fi
150
151 while ((i++ < ${str_length})) ; do
152 str_out="${str_out}="
153 done
154 echo ${str_out}
155
156 return 0
157 }
158 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; }
171 local PIPE_CMD="" 159 local PIPE_CMD=""
172 local STDERR_TARGET="${T}/$$.out" 160 local STDERR_TARGET="${T}/$$.out"
173 local PATCH_TARGET="${T}/$$.patch" 161 local PATCH_TARGET="${T}/$$.patch"
174 local PATCH_SUFFIX="" 162 local PATCH_SUFFIX=""
175 local SINGLE_PATCH="no" 163 local SINGLE_PATCH="no"
176 local x="" 164 local x=""
165
166 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
177 167
178 if [ "$#" -gt 1 ] 168 if [ "$#" -gt 1 ]
179 then 169 then
180 local m="" 170 local m=""
181 for m in "$@" ; do 171 for m in "$@" ; do
282 272
283 # Allow for prefix to differ ... im lazy, so shoot me :/ 273 # Allow for prefix to differ ... im lazy, so shoot me :/
284 while [ "${count}" -lt 5 ] 274 while [ "${count}" -lt 5 ]
285 do 275 do
286 # Generate some useful debug info ... 276 # Generate some useful debug info ...
287 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 277 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
288 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 278 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
289 279
290 if [ "${PATCH_SUFFIX}" != "patch" ] 280 if [ "${PATCH_SUFFIX}" != "patch" ]
291 then 281 then
292 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 282 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
297 287
298 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 288 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
299 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 289 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
300 290
301 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 291 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
302 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 292 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
303 293
304 if [ "${PATCH_SUFFIX}" != "patch" ] 294 if [ "${PATCH_SUFFIX}" != "patch" ]
305 then 295 then
306 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1 296 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
307 then 297 then
311 count=5 301 count=5
312 break 302 break
313 fi 303 fi
314 fi 304 fi
315 305
316 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1 306 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f ; _epatch_assert) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
317 then 307 then
318 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 308 _epatch_draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
319 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 309 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
320 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 310 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
321 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 311 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
322 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 312 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
323 313
324 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1 314 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
315 _epatch_assert
325 316
326 if [ "$?" -ne 0 ] 317 if [ "$?" -ne 0 ]
327 then 318 then
328 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 319 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
329 echo 320 echo
375# vapier@gentoo.org 366# vapier@gentoo.org
376# 367#
377# Takes just 1 optional parameter (the directory to create tmpfile in) 368# Takes just 1 optional parameter (the directory to create tmpfile in)
378emktemp() { 369emktemp() {
379 local exe="touch" 370 local exe="touch"
380 [ "$1" == "-d" ] && exe="mkdir" && shift 371 [[ $1 == -d ]] && exe="mkdir" && shift
381 local topdir="$1" 372 local topdir=$1
382 373
383 if [ -z "${topdir}" ] 374 if [[ -z ${topdir} ]] ; then
384 then
385 [ -z "${T}" ] \ 375 [[ -z ${T} ]] \
386 && topdir="/tmp" \ 376 && topdir="/tmp" \
387 || topdir="${T}" 377 || topdir=${T}
388 fi 378 fi
389 379
390 if [ -z "$(type -p mktemp)" ] 380 if [[ -z $(type -p mktemp) ]] ; then
391 then
392 local tmp=/ 381 local tmp=/
393 while [ -e "${tmp}" ] ; do 382 while [[ -e ${tmp} ]] ; do
394 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 383 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
395 done 384 done
396 ${exe} "${tmp}" 385 ${exe} "${tmp}" || ${exe} -p "${tmp}"
397 echo "${tmp}" 386 echo "${tmp}"
398 else 387 else
399 [ "${exe}" == "touch" ] \ 388 [[ ${exe} == "touch" ]] \
400 && exe="-p" \ 389 && exe="-p" \
401 || exe="-d" 390 || exe="-d"
402 mktemp ${exe} "${topdir}" 391 mktemp ${exe} "${topdir}"
403 fi 392 fi
404} 393}
408# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 397# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
409# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 398# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
410# 399#
411# egetent(database, key) 400# egetent(database, key)
412egetent() { 401egetent() {
413 if [[ "${USERLAND}" == "Darwin" ]] ; then 402 case ${CHOST} in
403 *-darwin*)
414 case "$2" in 404 case "$2" in
415 *[!0-9]*) # Non numeric 405 *[!0-9]*) # Non numeric
416 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 406 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
417 ;; 407 ;;
418 *) # Numeric 408 *) # Numeric
419 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 409 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
420 ;; 410 ;;
421 esac 411 esac
422 elif [[ "${USERLAND}" == "BSD" ]] ; then 412 ;;
423 local action 413 *-freebsd*|*-dragonfly*)
424 if [ "$1" == "passwd" ] 414 local opts action="user"
425 then 415 [[ $1 == "passwd" ]] || action="group"
426 action="user" 416
427 else 417 # lookup by uid/gid
428 action="group" 418 if [[ $2 == [[:digit:]]* ]] ; then
419 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
429 fi 420 fi
421
430 pw show "${action}" "$2" -q 422 pw show ${action} ${opts} "$2" -q
431 else 423 ;;
424 *-netbsd*|*-openbsd*)
425 grep "$2:\*:" /etc/$1
426 ;;
427 *)
432 which nscd >& /dev/null && nscd -i "$1" 428 type -p nscd >& /dev/null && nscd -i "$1"
433 getent "$1" "$2" 429 getent "$1" "$2"
434 fi 430 ;;
431 esac
435} 432}
436 433
437# Simplify/standardize adding users to the system 434# Simplify/standardize adding users to the system
438# vapier@gentoo.org 435# vapier@gentoo.org
439# 436#
477 fi 474 fi
478 else 475 else
479 euid="next" 476 euid="next"
480 fi 477 fi
481 if [[ ${euid} == "next" ]] ; then 478 if [[ ${euid} == "next" ]] ; then
482 local pwrange 479 for euid in $(seq 101 999) ; do
483 if [[ ${USERLAND} == "BSD" ]] ; then
484 pwrange=$(jot 898 101)
485 else
486 pwrange=$(seq 101 999)
487 fi
488 for euid in ${pwrange} ; do
489 [[ -z $(egetent passwd ${euid}) ]] && break 480 [[ -z $(egetent passwd ${euid}) ]] && break
490 done 481 done
491 fi 482 fi
492 opts="${opts} -u ${euid}" 483 opts="${opts} -u ${euid}"
493 einfo " - Userid: ${euid}" 484 einfo " - Userid: ${euid}"
498 if [[ ! -e ${eshell} ]] ; then 489 if [[ ! -e ${eshell} ]] ; then
499 eerror "A shell was specified but it does not exist !" 490 eerror "A shell was specified but it does not exist !"
500 die "${eshell} does not exist" 491 die "${eshell} does not exist"
501 fi 492 fi
502 else 493 else
503 case ${USERLAND} in 494 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
504 Darwin) eshell="/usr/bin/false";; 495 [[ -x ${ROOT}${shell} ]] && break
505 BSD) eshell="/usr/sbin/nologin";; 496 done
506 *) eshell="/bin/false";; 497
507 esac 498 if [[ ${shell} == "/dev/null" ]] ; then
499 eerror "Unable to identify the shell to use"
500 die "Unable to identify the shell to use"
501 fi
502
503 eshell=${shell}
508 fi 504 fi
509 einfo " - Shell: ${eshell}" 505 einfo " - Shell: ${eshell}"
510 opts="${opts} -s ${eshell}" 506 opts="${opts} -s ${eshell}"
511 507
512 # handle homedir 508 # handle homedir
549 einfo " - Groups: ${egroups}" 545 einfo " - Groups: ${egroups}"
550 546
551 # handle extra and add the user 547 # handle extra and add the user
552 local oldsandbox=${SANDBOX_ON} 548 local oldsandbox=${SANDBOX_ON}
553 export SANDBOX_ON="0" 549 export SANDBOX_ON="0"
554 case ${USERLAND} in 550 case ${CHOST} in
555 Darwin) 551 *-darwin*)
556 ### Make the user 552 ### Make the user
557 if [[ -z $@ ]] ; then 553 if [[ -z $@ ]] ; then
558 dscl . create /users/${euser} uid ${euid} 554 dscl . create /users/${euser} uid ${euid}
559 dscl . create /users/${euser} shell ${eshell} 555 dscl . create /users/${euser} shell ${eshell}
560 dscl . create /users/${euser} home ${ehome} 556 dscl . create /users/${euser} home ${ehome}
571 einfo "Please report the ebuild along with the info below" 567 einfo "Please report the ebuild along with the info below"
572 einfo "eextra: $@" 568 einfo "eextra: $@"
573 die "Required function missing" 569 die "Required function missing"
574 fi 570 fi
575 ;; 571 ;;
576 BSD) 572 *-freebsd*|*-dragonfly*)
577 if [[ -z $@ ]] ; then 573 if [[ -z $@ ]] ; then
578 pw useradd ${euser} ${opts} \ 574 pw useradd ${euser} ${opts} \
579 -c "added by portage for ${PN}" \ 575 -c "added by portage for ${PN}" \
580 die "enewuser failed" 576 die "enewuser failed"
581 else 577 else
582 einfo " - Extra: $@" 578 einfo " - Extra: $@"
583 pw useradd ${euser} ${opts} \ 579 pw useradd ${euser} ${opts} \
584 "$@" || die "enewuser failed" 580 "$@" || die "enewuser failed"
585 fi 581 fi
586 ;; 582 ;;
583
584 *-netbsd*)
585 if [[ -z $@ ]] ; then
586 useradd ${opts} ${euser} || die "enewuser failed"
587 else
588 einfo " - Extra: $@"
589 useradd ${opts} ${euser} "$@" || die "enewuser failed"
590 fi
591 ;;
592
593 *-openbsd*)
594 if [[ -z $@ ]] ; then
595 useradd -u ${euid} -s ${eshell} \
596 -d ${ehome} -c "Added by portage for ${PN}" \
597 -g ${egroups} ${euser} || die "enewuser failed"
598 else
599 einfo " - Extra: $@"
600 useradd -u ${euid} -s ${eshell} \
601 -d ${ehome} -c "Added by portage for ${PN}" \
602 -g ${egroups} ${euser} "$@" || die "enewuser failed"
603 fi
604 ;;
605
587 *) 606 *)
588 if [[ -z $@ ]] ; then 607 if [[ -z $@ ]] ; then
589 useradd ${opts} ${euser} \ 608 useradd ${opts} ${euser} \
590 -c "added by portage for ${PN}" \ 609 -c "added by portage for ${PN}" \
591 || die "enewuser failed" 610 || die "enewuser failed"
641 then 660 then
642 if [ "${egid}" -gt 0 ] 661 if [ "${egid}" -gt 0 ]
643 then 662 then
644 if [ -z "`egetent group ${egid}`" ] 663 if [ -z "`egetent group ${egid}`" ]
645 then 664 then
646 if [[ "${USERLAND}" == "Darwin" ]]; then 665 if [[ "${CHOST}" == *-darwin* ]]; then
647 opts="${opts} ${egid}" 666 opts="${opts} ${egid}"
648 else 667 else
649 opts="${opts} -g ${egid}" 668 opts="${opts} -g ${egid}"
650 fi 669 fi
651 else 670 else
665 opts="${opts} ${eextra}" 684 opts="${opts} ${eextra}"
666 685
667 # add the group 686 # add the group
668 local oldsandbox="${SANDBOX_ON}" 687 local oldsandbox="${SANDBOX_ON}"
669 export SANDBOX_ON="0" 688 export SANDBOX_ON="0"
670 if [[ "${USERLAND}" == "Darwin" ]]; then 689 case ${CHOST} in
690 *-darwin*)
671 if [ ! -z "${eextra}" ]; 691 if [ ! -z "${eextra}" ];
672 then 692 then
673 einfo "Extra options are not supported on Darwin/OS X yet" 693 einfo "Extra options are not supported on Darwin/OS X yet"
674 einfo "Please report the ebuild along with the info below" 694 einfo "Please report the ebuild along with the info below"
675 einfo "eextra: ${eextra}" 695 einfo "eextra: ${eextra}"
676 die "Required function missing" 696 die "Required function missing"
677 fi 697 fi
678 698
679 # If we need the next available 699 # If we need the next available
680 case ${egid} in 700 case ${egid} in
681 *[!0-9]*) # Non numeric 701 *[!0-9]*) # Non numeric
682 for egid in `jot 898 101`; do 702 for egid in $(seq 101 999); do
683 [ -z "`egetent group ${egid}`" ] && break 703 [ -z "`egetent group ${egid}`" ] && break
684 done 704 done
685 esac 705 esac
686 dscl . create /groups/${egroup} gid ${egid} 706 dscl . create /groups/${egroup} gid ${egid}
687 dscl . create /groups/${egroup} passwd '*' 707 dscl . create /groups/${egroup} passwd '*'
688 elif [[ "${USERLAND}" == "BSD" ]] ; then 708 ;;
709
710 *-freebsd*|*-dragonfly*)
689 case ${egid} in 711 case ${egid} in
690 *[!0-9]*) # Non numeric 712 *[!0-9]*) # Non numeric
691 for egid in `jot 898 101`; do 713 for egid in $(seq 101 999); do
692 [ -z "`egetent group ${egid}`" ] && break 714 [ -z "`egetent group ${egid}`" ] && break
693 done 715 done
694 esac 716 esac
695 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 717 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
696 else 718 ;;
719
720 *-netbsd*)
721 case ${egid} in
722 *[!0-9]*) # Non numeric
723 for egid in $(seq 101 999); do
724 [ -z "`egetent group ${egid}`" ] && break
725 done
726 esac
727 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
728 ;;
729
730 *)
697 groupadd ${opts} ${egroup} || die "enewgroup failed" 731 groupadd ${opts} ${egroup} || die "enewgroup failed"
698 fi 732 ;;
733 esac
699 export SANDBOX_ON="${oldsandbox}" 734 export SANDBOX_ON="${oldsandbox}"
700} 735}
701 736
702# Simple script to replace 'dos2unix' binaries 737# Simple script to replace 'dos2unix' binaries
703# vapier@gentoo.org 738# vapier@gentoo.org
814 type="Network;${type}" 849 type="Network;${type}"
815 ;; 850 ;;
816 851
817 sci) 852 sci)
818 case ${catmin} in 853 case ${catmin} in
819 astro*) type=Astronomoy;; 854 astro*) type=Astronomy;;
820 bio*) type=Biology;; 855 bio*) type=Biology;;
821 calc*) type=Calculator;; 856 calc*) type=Calculator;;
822 chem*) type=Chemistry;; 857 chem*) type=Chemistry;;
823 geo*) type=Geology;; 858 geo*) type=Geology;;
824 math*) type=Math;; 859 math*) type=Math;;
856Exec=${exec} 891Exec=${exec}
857Path=${path} 892Path=${path}
858Icon=${icon} 893Icon=${icon}
859Categories=Application;${type};" > "${desktop}" 894Categories=Application;${type};" > "${desktop}"
860 895
896 (
897 # wrap the env here so that the 'insinto' call
898 # doesn't corrupt the env of the caller
861 insinto /usr/share/applications 899 insinto /usr/share/applications
862 doins "${desktop}" 900 doins "${desktop}"
863 901 )
864 return 0
865} 902}
866 903
867# Make a GDM/KDM Session file 904# Make a GDM/KDM Session file
868# 905#
869# make_desktop_entry(<title>, <command>) 906# make_desktop_entry(<title>, <command>)
931############################################################## 968##############################################################
932 969
933 970
934# for internal use only (unpack_pdv and unpack_makeself) 971# for internal use only (unpack_pdv and unpack_makeself)
935find_unpackable_file() { 972find_unpackable_file() {
936 local src="$1" 973 local src=$1
937 if [ -z "${src}" ] 974 if [[ -z ${src} ]] ; then
938 then
939 src="${DISTDIR}/${A}" 975 src=${DISTDIR}/${A}
940 else 976 else
941 if [ -e "${DISTDIR}/${src}" ] 977 if [[ -e ${DISTDIR}/${src} ]] ; then
942 then
943 src="${DISTDIR}/${src}" 978 src=${DISTDIR}/${src}
944 elif [ -e "${PWD}/${src}" ] 979 elif [[ -e ${PWD}/${src} ]] ; then
945 then
946 src="${PWD}/${src}" 980 src=${PWD}/${src}
947 elif [ -e "${src}" ] 981 elif [[ -e ${src} ]] ; then
948 then
949 src="${src}" 982 src=${src}
950 fi
951 fi 983 fi
952 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 984 fi
985 [[ ! -e ${src} ]] && return 1
953 echo "${src}" 986 echo "${src}"
954} 987}
955 988
956# Unpack those pesky pdv generated files ... 989# Unpack those pesky pdv generated files ...
957# They're self-unpacking programs with the binary package stuffed in 990# They're self-unpacking programs with the binary package stuffed in
972# lseek 1005# lseek
973# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1006# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
974# lseek(3, -4, SEEK_END) = 2981250 1007# lseek(3, -4, SEEK_END) = 2981250
975# thus we would pass in the value of '4' as the second parameter. 1008# thus we would pass in the value of '4' as the second parameter.
976unpack_pdv() { 1009unpack_pdv() {
977 local src="`find_unpackable_file $1`" 1010 local src=$(find_unpackable_file $1)
978 local sizeoff_t="$2" 1011 local sizeoff_t=$2
979 1012
1013 [[ -z ${src} ]] && die "Could not locate source for '$1'"
980 [ -z "${sizeoff_t}" ] && die "No idea what off_t size was used for this pdv :(" 1014 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
981 1015
982 local shrtsrc="`basename ${src}`" 1016 local shrtsrc=$(basename "${src}")
983 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1017 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
984 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1018 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
985 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"` 1019 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
986 1020
987 # grab metadata for debug reasons 1021 # grab metadata for debug reasons
1051# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1085# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1052# - If the file is not specified then unpack will utilize ${A}. 1086# - If the file is not specified then unpack will utilize ${A}.
1053# - If the offset is not specified then we will attempt to extract 1087# - If the offset is not specified then we will attempt to extract
1054# the proper offset from the script itself. 1088# the proper offset from the script itself.
1055unpack_makeself() { 1089unpack_makeself() {
1090 local src_input=${1:-${A}}
1056 local src="$(find_unpackable_file "$1")" 1091 local src=$(find_unpackable_file "${src_input}")
1057 local skip="$2" 1092 local skip=$2
1058 local exe="$3" 1093 local exe=$3
1059 1094
1095 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1096
1060 local shrtsrc="$(basename "${src}")" 1097 local shrtsrc=$(basename "${src}")
1061 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1098 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1062 if [ -z "${skip}" ] 1099 if [[ -z ${skip} ]] ; then
1063 then
1064 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1100 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1065 local skip=0 1101 local skip=0
1066 exe=tail 1102 exe=tail
1067 case ${ver} in 1103 case ${ver} in
1068 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1104 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
1069 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1105 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1081 ;; 1117 ;;
1082 2.1.3) 1118 2.1.3)
1083 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1119 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1084 let skip="skip + 1" 1120 let skip="skip + 1"
1085 ;; 1121 ;;
1086 2.1.4) 1122 2.1.4|2.1.5)
1087 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1) 1123 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
1088 skip=$(head -n ${skip} "${src}" | wc -c) 1124 skip=$(head -n ${skip} "${src}" | wc -c)
1089 exe="dd" 1125 exe="dd"
1090 ;; 1126 ;;
1091 *) 1127 *)
1136check_license() { 1172check_license() {
1137 local lic=$1 1173 local lic=$1
1138 if [ -z "${lic}" ] ; then 1174 if [ -z "${lic}" ] ; then
1139 lic="${PORTDIR}/licenses/${LICENSE}" 1175 lic="${PORTDIR}/licenses/${LICENSE}"
1140 else 1176 else
1141 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1177 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1142 lic="${PORTDIR}/licenses/${src}" 1178 lic="${PORTDIR}/licenses/${lic}"
1143 elif [ -e "${PWD}/${src}" ] ; then 1179 elif [ -e "${PWD}/${lic}" ] ; then
1144 lic="${PWD}/${src}" 1180 lic="${PWD}/${lic}"
1145 elif [ -e "${src}" ] ; then 1181 elif [ -e "${lic}" ] ; then
1146 lic="${src}" 1182 lic="${lic}"
1147 fi
1148 fi 1183 fi
1184 fi
1149 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1185 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1150 local l="`basename ${lic}`" 1186 local l="`basename ${lic}`"
1151 1187
1152 # here is where we check for the licenses the user already 1188 # here is where we check for the licenses the user already
1153 # accepted ... if we don't find a match, we make the user accept 1189 # accepted ... if we don't find a match, we make the user accept
1154 local shopts=$- 1190 local shopts=$-
1210 # first we figure out how many cds we're dealing with by 1246 # first we figure out how many cds we're dealing with by
1211 # the # of files they gave us 1247 # the # of files they gave us
1212 local cdcnt=0 1248 local cdcnt=0
1213 local f= 1249 local f=
1214 for f in "$@" ; do 1250 for f in "$@" ; do
1215 cdcnt=$((cdcnt + 1)) 1251 ((++cdcnt))
1216 export CDROM_CHECK_${cdcnt}="$f" 1252 export CDROM_CHECK_${cdcnt}="$f"
1217 done 1253 done
1218 export CDROM_TOTAL_CDS=${cdcnt} 1254 export CDROM_TOTAL_CDS=${cdcnt}
1219 export CDROM_CURRENT_CD=1 1255 export CDROM_CURRENT_CD=1
1220 1256
1221 # now we see if the user gave use CD_ROOT ... 1257 # now we see if the user gave use CD_ROOT ...
1222 # if they did, let's just believe them that it's correct 1258 # if they did, let's just believe them that it's correct
1223 if [[ ! -z ${CD_ROOT} ]] ; then
1224 export CDROM_ROOT=${CD_ROOT}
1225 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1226 return
1227 fi
1228 # do the same for CD_ROOT_X
1229 if [[ ! -z ${CD_ROOT_1} ]] ; then 1259 if [[ -n ${CD_ROOT}${CD_ROOT_1} ]] ; then
1230 local var= 1260 local var=
1231 cdcnt=0 1261 cdcnt=0
1232 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1262 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1233 cdcnt=$((cdcnt + 1)) 1263 ((++cdcnt))
1234 var="CD_ROOT_${cdcnt}" 1264 var="CD_ROOT_${cdcnt}"
1265 [[ -z ${!var} ]] && var="CD_ROOT"
1235 if [[ -z ${!var} ]] ; then 1266 if [[ -z ${!var} ]] ; then
1236 eerror "You must either use just the CD_ROOT" 1267 eerror "You must either use just the CD_ROOT"
1237 eerror "or specify ALL the CD_ROOT_X variables." 1268 eerror "or specify ALL the CD_ROOT_X variables."
1238 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables." 1269 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."
1239 die "could not locate CD_ROOT_${cdcnt}" 1270 die "could not locate CD_ROOT_${cdcnt}"
1240 fi 1271 fi
1241 export CDROM_ROOTS_${cdcnt}="${!var}"
1242 done 1272 done
1243 export CDROM_ROOT=${CDROM_ROOTS_1} 1273 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1244 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1274 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1275 export CDROM_SET=-1
1276 for f in ${CDROM_CHECK_1//:/ } ; do
1277 ((++CDROM_SET))
1278 [[ -e ${CD_ROOT}/${f} ]] && break
1279 done
1280 export CDROM_MATCH=${f}
1245 return 1281 return
1246 fi 1282 fi
1247 1283
1284 # User didn't help us out so lets make sure they know they can
1285 # simplify the whole process ...
1248 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1286 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1249 einfon "This ebuild will need the " 1287 einfo "This ebuild will need the ${CDROM_NAME:-cdrom for ${PN}}"
1250 if [[ -z ${CDROM_NAME} ]] ; then
1251 echo "cdrom for ${PN}."
1252 else
1253 echo "${CDROM_NAME}."
1254 fi
1255 echo 1288 echo
1256 einfo "If you do not have the CD, but have the data files" 1289 einfo "If you do not have the CD, but have the data files"
1257 einfo "mounted somewhere on your filesystem, just export" 1290 einfo "mounted somewhere on your filesystem, just export"
1258 einfo "the variable CD_ROOT so that it points to the" 1291 einfo "the variable CD_ROOT so that it points to the"
1259 einfo "directory containing the files." 1292 einfo "directory containing the files."
1263 echo 1296 echo
1264 else 1297 else
1265 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1298 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1266 cdcnt=0 1299 cdcnt=0
1267 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1300 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1268 cdcnt=$((cdcnt + 1)) 1301 ((++cdcnt))
1269 var="CDROM_NAME_${cdcnt}" 1302 var="CDROM_NAME_${cdcnt}"
1270 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}" 1303 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1271 done 1304 done
1272 echo 1305 echo
1273 einfo "If you do not have the CDs, but have the data files" 1306 einfo "If you do not have the CDs, but have the data files"
1274 einfo "mounted somewhere on your filesystem, just export" 1307 einfo "mounted somewhere on your filesystem, just export"
1275 einfo "the following variables so they point to the right place:" 1308 einfo "the following variables so they point to the right place:"
1276 einfon "" 1309 einfon ""
1277 cdcnt=0 1310 cdcnt=0
1278 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1311 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1279 cdcnt=$((cdcnt + 1)) 1312 ((++cdcnt))
1280 echo -n " CD_ROOT_${cdcnt}" 1313 echo -n " CD_ROOT_${cdcnt}"
1281 done 1314 done
1282 echo 1315 echo
1283 einfo "Or, if you have all the files in the same place, or" 1316 einfo "Or, if you have all the files in the same place, or"
1284 einfo "you only have one cdrom, you can export CD_ROOT" 1317 einfo "you only have one cdrom, you can export CD_ROOT"
1287 echo 1320 echo
1288 einfo "For example:" 1321 einfo "For example:"
1289 einfo "export CD_ROOT_1=/mnt/cdrom" 1322 einfo "export CD_ROOT_1=/mnt/cdrom"
1290 echo 1323 echo
1291 fi 1324 fi
1325
1326 export CDROM_SET=""
1292 export CDROM_CURRENT_CD=0 1327 export CDROM_CURRENT_CD=0
1293 cdrom_load_next_cd 1328 cdrom_load_next_cd
1294} 1329}
1295 1330
1296# this is only used when you need access to more than one cd. 1331# this is only used when you need access to more than one cd.
1297# when you have finished using the first cd, just call this function. 1332# when you have finished using the first cd, just call this function.
1298# when it returns, CDROM_ROOT will be pointing to the second cd. 1333# when it returns, CDROM_ROOT will be pointing to the second cd.
1299# remember, you can only go forward in the cd chain, you can't go back. 1334# remember, you can only go forward in the cd chain, you can't go back.
1300cdrom_load_next_cd() { 1335cdrom_load_next_cd() {
1301 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1302 local var= 1336 local var
1303 1337 ((++CDROM_CURRENT_CD))
1304 if [[ ! -z ${CD_ROOT} ]] ; then
1305 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1306 return
1307 fi
1308 1338
1309 unset CDROM_ROOT 1339 unset CDROM_ROOT
1310 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1340 var=CD_ROOT_${CDROM_CURRENT_CD}
1341 [[ -z ${!var} ]] && var="CD_ROOT"
1311 if [[ -z ${!var} ]] ; then 1342 if [[ -z ${!var} ]] ; then
1312 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1343 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1313 cdrom_locate_file_on_cd ${!var} 1344 _cdrom_locate_file_on_cd ${!var}
1314 else 1345 else
1315 export CDROM_ROOT=${!var} 1346 export CDROM_ROOT=${!var}
1316 fi 1347 fi
1317 1348
1318 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1349 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1323# all it does is try to locate a give file on a cd ... if the cd isn't 1354# all it does is try to locate a give file on a cd ... if the cd isn't
1324# found, then a message asking for the user to insert the cdrom will be 1355# found, then a message asking for the user to insert the cdrom will be
1325# displayed and we'll hang out here until: 1356# displayed and we'll hang out here until:
1326# (1) the file is found on a mounted cdrom 1357# (1) the file is found on a mounted cdrom
1327# (2) the user hits CTRL+C 1358# (2) the user hits CTRL+C
1328cdrom_locate_file_on_cd() { 1359_cdrom_locate_file_on_cd() {
1360 local mline=""
1361 local showedmsg=0
1362
1329 while [[ -z ${CDROM_ROOT} ]] ; do 1363 while [[ -z ${CDROM_ROOT} ]] ; do
1330 local dir=$(dirname "$*") 1364 local i=0
1365 local -a cdset=(${*//:/ })
1366 if [[ -n ${CDROM_SET} ]] ; then
1367 cdset=(${cdset[${CDROM_SET}]})
1368 fi
1369
1370 while [[ -n ${cdset[${i}]} ]] ; do
1371 local dir=$(dirname ${cdset[${i}]})
1331 local file=$(basename "$*") 1372 local file=$(basename ${cdset[${i}]})
1332 local mline=""
1333 local showedmsg=0
1334 1373
1335 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1374 for mline in $(mount | gawk '/(iso|cdrom|fs=cdfss)/ {print $3}') ; do
1336 [[ -d ${mline}/${dir} ]] || continue 1375 [[ -d ${mline}/${dir} ]] || continue
1337 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \ 1376 if [[ -n $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] ; then
1338 && export CDROM_ROOT=${mline} 1377 export CDROM_ROOT=${mline}
1378 export CDROM_SET=${i}
1379 export CDROM_MATCH=${cdset[${i}]}
1380 return
1381 fi
1382 done
1383
1384 ((++i))
1339 done 1385 done
1340 1386
1341 if [[ -z ${CDROM_ROOT} ]] ; then
1342 echo 1387 echo
1343 if [[ ${showedmsg} -eq 0 ]] ; then 1388 if [[ ${showedmsg} -eq 0 ]] ; then
1344 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1389 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1345 if [[ -z ${CDROM_NAME} ]] ; then 1390 if [[ -z ${CDROM_NAME} ]] ; then
1346 einfo "Please insert the cdrom for ${PN} now !" 1391 einfo "Please insert+mount the cdrom for ${PN} now !"
1347 else
1348 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1349 fi
1350 else 1392 else
1351 if [[ -z ${CDROM_NAME_1} ]] ; then
1352 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1353 else
1354 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1355 einfo "Please insert+mount the ${!var} cdrom now !" 1393 einfo "Please insert+mount the ${CDROM_NAME} cdrom now !"
1356 fi
1357 fi 1394 fi
1358 showedmsg=1 1395 else
1396 if [[ -z ${CDROM_NAME_1} ]] ; then
1397 einfo "Please insert+mount cd #${CDROM_CURRENT_CD} for ${PN} now !"
1398 else
1399 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1400 einfo "Please insert+mount the ${!var} cdrom now !"
1401 fi
1359 fi 1402 fi
1403 showedmsg=1
1404 fi
1360 einfo "Press return to scan for the cd again" 1405 einfo "Press return to scan for the cd again"
1361 einfo "or hit CTRL+C to abort the emerge." 1406 einfo "or hit CTRL+C to abort the emerge."
1362 echo 1407 echo
1363 einfo "If you are having trouble with the detection" 1408 einfo "If you are having trouble with the detection"
1364 einfo "of your CD, it is possible that you do not have" 1409 einfo "of your CD, it is possible that you do not have"
1365 einfo "Joliet support enabled in your kernel. Please" 1410 einfo "Joliet support enabled in your kernel. Please"
1366 einfo "check that CONFIG_JOLIET is enabled in your kernel." 1411 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1367 read 1412 read
1368 fi
1369 done 1413 done
1370} 1414}
1371 1415
1372# Make sure that LINGUAS only contains languages that 1416# Make sure that LINGUAS only contains languages that
1373# a package can support 1417# a package can support
1521 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1565 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1522 1566
1523 local PKG=$(best_version $1) 1567 local PKG=$(best_version $1)
1524 shift 1568 shift
1525 1569
1526 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE" 1570 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
1571
1572 # if the USE file doesnt exist, assume the $PKG is either
1573 # injected or package.provided
1527 [[ ! -e ${USEFILE} ]] && return 1 1574 [[ ! -e ${USEFILE} ]] && return 0
1528 1575
1529 local USE_BUILT=$(<${USEFILE}) 1576 local USE_BUILT=$(<${USEFILE})
1530 while [[ $# -gt 0 ]] ; do 1577 while [[ $# -gt 0 ]] ; do
1531 if [[ ${opt} = "-o" ]] ; then 1578 if [[ ${opt} = "-o" ]] ; then
1532 has $1 ${USE_BUILT} && return 0 1579 has $1 ${USE_BUILT} && return 0
1584# $4 == extra LD_LIBRARY_PATH's (make it : delimited) 1631# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1585# $5 == path for wrapper 1632# $5 == path for wrapper
1586make_wrapper() { 1633make_wrapper() {
1587 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5 1634 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1588 local tmpwrapper=$(emktemp) 1635 local tmpwrapper=$(emktemp)
1636 # We don't want to quote ${bin} so that people can pass complex
1637 # things as $bin ... "./someprog --args"
1589 cat << EOF > "${tmpwrapper}" 1638 cat << EOF > "${tmpwrapper}"
1590#!/bin/sh 1639#!/bin/sh
1591cd "${chdir}" 1640cd "${chdir:-.}"
1641if [ -n "${libdir}" ] ; then
1642 if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
1592export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}" 1643 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1644 else
1645 export LD_LIBRARY_PATH="${libdir}"
1646 fi
1647fi
1593exec ${bin} "\$@" 1648exec ${bin} "\$@"
1594EOF 1649EOF
1595 chmod go+rx "${tmpwrapper}" 1650 chmod go+rx "${tmpwrapper}"
1596 if [ -n "${5}" ] 1651 if [[ -n ${path} ]] ; then
1597 then
1598 exeinto ${5} 1652 exeinto "${path}"
1599 newexe "${tmpwrapper}" "${wrapper}" 1653 newexe "${tmpwrapper}" "${wrapper}"
1600 else 1654 else
1601 newbin "${tmpwrapper}" "${wrapper}" 1655 newbin "${tmpwrapper}" "${wrapper}"
1602 fi 1656 fi
1603} 1657}

Legend:
Removed from v.1.193  
changed lines
  Added in v.1.220

  ViewVC Help
Powered by ViewVC 1.1.20