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

Diff of /eclass/eutils.eclass

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

Revision 1.200 Revision 1.232
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.200 2005/09/23 20:44:26 wolf31o2 Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.232 2006/03/22 21:18:05 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.
10# NB: If you add anything, please comment it! 10# NB: If you add anything, please comment it!
11 11
12inherit multilib portability 12inherit multilib portability
13 13
14DEPEND="!bootstrap? ( sys-devel/patch )" 14DEPEND="!bootstrap? ( sys-devel/patch )"
15RDEPEND=""
15# sys-apps/shadow is needed for useradd, etc, bug #94745. 16# sys-apps/shadow is needed for useradd, etc, bug #94745.
16 17
17DESCRIPTION="Based on the ${ECLASS} eclass" 18DESCRIPTION="Based on the ${ECLASS} eclass"
18 19
19# Wait for the supplied number of seconds. If no argument is supplied, defaults 20# Wait for the supplied number of seconds. If no argument is supplied, defaults
60# to point to the latest version of the library present. 61# to point to the latest version of the library present.
61# 62#
62# <azarah@gentoo.org> (26 Oct 2002) 63# <azarah@gentoo.org> (26 Oct 2002)
63# 64#
64gen_usr_ldscript() { 65gen_usr_ldscript() {
65 local libdir="$(get_libdir)" 66 local lib libdir=$(get_libdir)
66 # Just make sure it exists 67 # Just make sure it exists
67 dodir /usr/${libdir} 68 dodir /usr/${libdir}
68 69
69 for lib in "${@}" ; do 70 for lib in "${@}" ; do
70 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT 71 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT
76 77
77 See bug http://bugs.gentoo.org/4411 for more info. 78 See bug http://bugs.gentoo.org/4411 for more info.
78 */ 79 */
79 GROUP ( /${libdir}/${lib} ) 80 GROUP ( /${libdir}/${lib} )
80 END_LDSCRIPT 81 END_LDSCRIPT
81 fperms a+x "/usr/${libdir}/${lib}" 82 fperms a+x "/usr/${libdir}/${lib}" || die "could not change perms on ${lib}"
82 done 83 done
83} 84}
84 85
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 86
116# Default directory where patches are located 87# Default directory where patches are located
117EPATCH_SOURCE="${WORKDIR}/patch" 88EPATCH_SOURCE="${WORKDIR}/patch"
118# Default extension for patches 89# Default extension for patches
119EPATCH_SUFFIX="patch.bz2" 90EPATCH_SUFFIX="patch.bz2"
120# Default options for patch 91# Default options for patch
121# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571 92# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571
122# Set --no-backup-if-mismatch so we don't leave '.orig' files behind. 93# Set --no-backup-if-mismatch so we don't leave '.orig' files behind.
94# Set -E to automatically remove empty files.
123EPATCH_OPTS="-g0 --no-backup-if-mismatch" 95EPATCH_OPTS="-g0 -E --no-backup-if-mismatch"
124# List of patches not to apply. Not this is only file names, 96# List of patches not to apply. Not this is only file names,
125# and not the full path .. 97# and not the full path ..
126EPATCH_EXCLUDE="" 98EPATCH_EXCLUDE=""
127# Change the printed message for a single patch. 99# Change the printed message for a single patch.
128EPATCH_SINGLE_MSG="" 100EPATCH_SINGLE_MSG=""
166# hand its a directory, it will set EPATCH_SOURCE to this. 138# hand its a directory, it will set EPATCH_SOURCE to this.
167# 139#
168# <azarah@gentoo.org> (10 Nov 2002) 140# <azarah@gentoo.org> (10 Nov 2002)
169# 141#
170epatch() { 142epatch() {
143 _epatch_draw_line() {
144 [[ -z $1 ]] && set "$(printf "%65s" '')"
145 echo "${1//?/=}"
146 }
147 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; }
171 local PIPE_CMD="" 148 local PIPE_CMD=""
172 local STDERR_TARGET="${T}/$$.out" 149 local STDERR_TARGET="${T}/$$.out"
173 local PATCH_TARGET="${T}/$$.patch" 150 local PATCH_TARGET="${T}/$$.patch"
174 local PATCH_SUFFIX="" 151 local PATCH_SUFFIX=""
175 local SINGLE_PATCH="no" 152 local SINGLE_PATCH="no"
284 261
285 # Allow for prefix to differ ... im lazy, so shoot me :/ 262 # Allow for prefix to differ ... im lazy, so shoot me :/
286 while [ "${count}" -lt 5 ] 263 while [ "${count}" -lt 5 ]
287 do 264 do
288 # Generate some useful debug info ... 265 # Generate some useful debug info ...
289 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 266 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
290 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 267 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
291 268
292 if [ "${PATCH_SUFFIX}" != "patch" ] 269 if [ "${PATCH_SUFFIX}" != "patch" ]
293 then 270 then
294 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 271 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
299 276
300 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 277 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
301 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 278 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
302 279
303 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 280 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
304 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 281 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
305 282
306 if [ "${PATCH_SUFFIX}" != "patch" ] 283 if [ "${PATCH_SUFFIX}" != "patch" ]
307 then 284 then
308 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1 285 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
309 then 286 then
313 count=5 290 count=5
314 break 291 break
315 fi 292 fi
316 fi 293 fi
317 294
318 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1 295 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f ; _epatch_assert) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
319 then 296 then
320 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 297 _epatch_draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
321 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 298 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
322 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 299 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
323 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 300 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
324 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 301 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
325 302
326 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1 303 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
304 _epatch_assert
327 305
328 if [ "$?" -ne 0 ] 306 if [ "$?" -ne 0 ]
329 then 307 then
330 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 308 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
331 echo 309 echo
394 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM} 372 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
395 done 373 done
396 ${exe} "${tmp}" || ${exe} -p "${tmp}" 374 ${exe} "${tmp}" || ${exe} -p "${tmp}"
397 echo "${tmp}" 375 echo "${tmp}"
398 else 376 else
399 [[ ${exe} == "touch" ]] \ 377 if [[ ${exe} == "touch" ]] ; then
400 && exe="-p" \ 378 [[ ${USERLAND} == "GNU" ]] \
401 || exe="-d" 379 && mktemp -p "${topdir}" \
402 mktemp ${exe} "${topdir}" 380 || TMPDIR="${topdir}" mktemp -t tmp
381 else
382 [[ ${USERLAND} == "GNU" ]] \
383 && mktemp -d "${topdir}" \
384 || TMPDIR="${topdir}" mktemp -dt tmp
385 fi
403 fi 386 fi
404} 387}
405 388
406# Small wrapper for getent (Linux), nidump (Mac OS X), 389# Small wrapper for getent (Linux), nidump (Mac OS X),
407# and pw (FreeBSD) used in enewuser()/enewgroup() 390# and pw (FreeBSD) used in enewuser()/enewgroup()
408# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 391# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
409# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 392# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
410# 393#
411# egetent(database, key) 394# egetent(database, key)
412egetent() { 395egetent() {
413 if [[ "${USERLAND}" == "Darwin" ]] ; then 396 case ${CHOST} in
397 *-darwin*)
414 case "$2" in 398 case "$2" in
415 *[!0-9]*) # Non numeric 399 *[!0-9]*) # Non numeric
416 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 400 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
417 ;; 401 ;;
418 *) # Numeric 402 *) # Numeric
419 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 403 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
420 ;; 404 ;;
421 esac 405 esac
422 elif [[ "${USERLAND}" == "BSD" ]] ; then 406 ;;
423 local action 407 *-freebsd*|*-dragonfly*)
424 if [ "$1" == "passwd" ] 408 local opts action="user"
425 then 409 [[ $1 == "passwd" ]] || action="group"
426 action="user" 410
427 else 411 # lookup by uid/gid
428 action="group" 412 if [[ $2 == [[:digit:]]* ]] ; then
413 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
429 fi 414 fi
415
430 pw show "${action}" "$2" -q 416 pw show ${action} ${opts} "$2" -q
431 else 417 ;;
418 *-netbsd*|*-openbsd*)
419 grep "$2:\*:" /etc/$1
420 ;;
421 *)
432 which nscd >& /dev/null && nscd -i "$1" 422 type -p nscd >& /dev/null && nscd -i "$1"
433 getent "$1" "$2" 423 getent "$1" "$2"
434 fi 424 ;;
425 esac
435} 426}
436 427
437# Simplify/standardize adding users to the system 428# Simplify/standardize adding users to the system
438# vapier@gentoo.org 429# vapier@gentoo.org
439# 430#
487 einfo " - Userid: ${euid}" 478 einfo " - Userid: ${euid}"
488 479
489 # handle shell 480 # handle shell
490 local eshell=$1; shift 481 local eshell=$1; shift
491 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then 482 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
492 if [[ ! -e ${eshell} ]] ; then 483 if [[ ! -e ${ROOT}${eshell} ]] ; then
493 eerror "A shell was specified but it does not exist !" 484 eerror "A shell was specified but it does not exist !"
494 die "${eshell} does not exist" 485 die "${eshell} does not exist in ${ROOT}"
495 fi 486 fi
487 if [[ ${eshell} == */false || ${eshell} == */nologin ]] ; then
488 eerror "Do not specify ${eshell} yourself, use -1"
489 die "Pass '-1' as the shell parameter"
490 fi
496 else 491 else
497 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null; do 492 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
498 [[ -x ${ROOT}${shell} ]] && break; 493 [[ -x ${ROOT}${shell} ]] && break
499 done 494 done
500 495
501 if [[ ${shell} == "/dev/null" ]]; then 496 if [[ ${shell} == "/dev/null" ]] ; then
502 eerror "Unable to identify the shell to use" 497 eerror "Unable to identify the shell to use"
503 die "Unable to identify the shell to use" 498 die "Unable to identify the shell to use"
504 fi 499 fi
505 500
506 eshell=${shell} 501 eshell=${shell}
548 einfo " - Groups: ${egroups}" 543 einfo " - Groups: ${egroups}"
549 544
550 # handle extra and add the user 545 # handle extra and add the user
551 local oldsandbox=${SANDBOX_ON} 546 local oldsandbox=${SANDBOX_ON}
552 export SANDBOX_ON="0" 547 export SANDBOX_ON="0"
553 case ${USERLAND} in 548 case ${CHOST} in
554 Darwin) 549 *-darwin*)
555 ### Make the user 550 ### Make the user
556 if [[ -z $@ ]] ; then 551 if [[ -z $@ ]] ; then
557 dscl . create /users/${euser} uid ${euid} 552 dscl . create /users/${euser} uid ${euid}
558 dscl . create /users/${euser} shell ${eshell} 553 dscl . create /users/${euser} shell ${eshell}
559 dscl . create /users/${euser} home ${ehome} 554 dscl . create /users/${euser} home ${ehome}
570 einfo "Please report the ebuild along with the info below" 565 einfo "Please report the ebuild along with the info below"
571 einfo "eextra: $@" 566 einfo "eextra: $@"
572 die "Required function missing" 567 die "Required function missing"
573 fi 568 fi
574 ;; 569 ;;
575 BSD) 570 *-freebsd*|*-dragonfly*)
576 if [[ -z $@ ]] ; then 571 if [[ -z $@ ]] ; then
577 pw useradd ${euser} ${opts} \ 572 pw useradd ${euser} ${opts} \
578 -c "added by portage for ${PN}" \ 573 -c "added by portage for ${PN}" \
579 die "enewuser failed" 574 die "enewuser failed"
580 else 575 else
581 einfo " - Extra: $@" 576 einfo " - Extra: $@"
582 pw useradd ${euser} ${opts} \ 577 pw useradd ${euser} ${opts} \
583 "$@" || die "enewuser failed" 578 "$@" || die "enewuser failed"
584 fi 579 fi
585 ;; 580 ;;
581
582 *-netbsd*)
583 if [[ -z $@ ]] ; then
584 useradd ${opts} ${euser} || die "enewuser failed"
585 else
586 einfo " - Extra: $@"
587 useradd ${opts} ${euser} "$@" || die "enewuser failed"
588 fi
589 ;;
590
591 *-openbsd*)
592 if [[ -z $@ ]] ; then
593 useradd -u ${euid} -s ${eshell} \
594 -d ${ehome} -c "Added by portage for ${PN}" \
595 -g ${egroups} ${euser} || die "enewuser failed"
596 else
597 einfo " - Extra: $@"
598 useradd -u ${euid} -s ${eshell} \
599 -d ${ehome} -c "Added by portage for ${PN}" \
600 -g ${egroups} ${euser} "$@" || die "enewuser failed"
601 fi
602 ;;
603
586 *) 604 *)
587 if [[ -z $@ ]] ; then 605 if [[ -z $@ ]] ; then
588 useradd ${opts} ${euser} \ 606 useradd ${opts} ${euser} \
589 -c "added by portage for ${PN}" \ 607 -c "added by portage for ${PN}" \
590 || die "enewuser failed" 608 || die "enewuser failed"
640 then 658 then
641 if [ "${egid}" -gt 0 ] 659 if [ "${egid}" -gt 0 ]
642 then 660 then
643 if [ -z "`egetent group ${egid}`" ] 661 if [ -z "`egetent group ${egid}`" ]
644 then 662 then
645 if [[ "${USERLAND}" == "Darwin" ]]; then 663 if [[ "${CHOST}" == *-darwin* ]]; then
646 opts="${opts} ${egid}" 664 opts="${opts} ${egid}"
647 else 665 else
648 opts="${opts} -g ${egid}" 666 opts="${opts} -g ${egid}"
649 fi 667 fi
650 else 668 else
664 opts="${opts} ${eextra}" 682 opts="${opts} ${eextra}"
665 683
666 # add the group 684 # add the group
667 local oldsandbox="${SANDBOX_ON}" 685 local oldsandbox="${SANDBOX_ON}"
668 export SANDBOX_ON="0" 686 export SANDBOX_ON="0"
669 if [[ "${USERLAND}" == "Darwin" ]]; then 687 case ${CHOST} in
688 *-darwin*)
670 if [ ! -z "${eextra}" ]; 689 if [ ! -z "${eextra}" ];
671 then 690 then
672 einfo "Extra options are not supported on Darwin/OS X yet" 691 einfo "Extra options are not supported on Darwin/OS X yet"
673 einfo "Please report the ebuild along with the info below" 692 einfo "Please report the ebuild along with the info below"
674 einfo "eextra: ${eextra}" 693 einfo "eextra: ${eextra}"
675 die "Required function missing" 694 die "Required function missing"
676 fi 695 fi
677 696
678 # If we need the next available 697 # If we need the next available
679 case ${egid} in 698 case ${egid} in
680 *[!0-9]*) # Non numeric 699 *[!0-9]*) # Non numeric
681 for egid in $(seq 101 999); do 700 for egid in $(seq 101 999); do
682 [ -z "`egetent group ${egid}`" ] && break 701 [ -z "`egetent group ${egid}`" ] && break
683 done 702 done
684 esac 703 esac
685 dscl . create /groups/${egroup} gid ${egid} 704 dscl . create /groups/${egroup} gid ${egid}
686 dscl . create /groups/${egroup} passwd '*' 705 dscl . create /groups/${egroup} passwd '*'
687 elif [[ "${USERLAND}" == "BSD" ]] ; then 706 ;;
707
708 *-freebsd*|*-dragonfly*)
688 case ${egid} in 709 case ${egid} in
689 *[!0-9]*) # Non numeric 710 *[!0-9]*) # Non numeric
690 for egid in $(seq 101 999); do 711 for egid in $(seq 101 999); do
691 [ -z "`egetent group ${egid}`" ] && break 712 [ -z "`egetent group ${egid}`" ] && break
692 done 713 done
693 esac 714 esac
694 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 715 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
695 else 716 ;;
717
718 *-netbsd*)
719 case ${egid} in
720 *[!0-9]*) # Non numeric
721 for egid in $(seq 101 999); do
722 [ -z "`egetent group ${egid}`" ] && break
723 done
724 esac
725 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
726 ;;
727
728 *)
696 groupadd ${opts} ${egroup} || die "enewgroup failed" 729 groupadd ${opts} ${egroup} || die "enewgroup failed"
697 fi 730 ;;
731 esac
698 export SANDBOX_ON="${oldsandbox}" 732 export SANDBOX_ON="${oldsandbox}"
699} 733}
700 734
701# Simple script to replace 'dos2unix' binaries 735# Simple script to replace 'dos2unix' binaries
702# vapier@gentoo.org 736# vapier@gentoo.org
813 type="Network;${type}" 847 type="Network;${type}"
814 ;; 848 ;;
815 849
816 sci) 850 sci)
817 case ${catmin} in 851 case ${catmin} in
818 astro*) type=Astronomoy;; 852 astro*) type=Astronomy;;
819 bio*) type=Biology;; 853 bio*) type=Biology;;
820 calc*) type=Calculator;; 854 calc*) type=Calculator;;
821 chem*) type=Chemistry;; 855 chem*) type=Chemistry;;
822 geo*) type=Geology;; 856 geo*) type=Geology;;
823 math*) type=Math;; 857 math*) type=Math;;
855Exec=${exec} 889Exec=${exec}
856Path=${path} 890Path=${path}
857Icon=${icon} 891Icon=${icon}
858Categories=Application;${type};" > "${desktop}" 892Categories=Application;${type};" > "${desktop}"
859 893
894 (
895 # wrap the env here so that the 'insinto' call
896 # doesn't corrupt the env of the caller
860 insinto /usr/share/applications 897 insinto /usr/share/applications
861 doins "${desktop}" 898 doins "${desktop}"
862 899 )
863 return 0
864} 900}
865 901
866# Make a GDM/KDM Session file 902# Make a GDM/KDM Session file
867# 903#
868# make_desktop_entry(<title>, <command>) 904# make_desktop_entry(<title>, <command>)
973 local sizeoff_t=$2 1009 local sizeoff_t=$2
974 1010
975 [[ -z ${src} ]] && die "Could not locate source for '$1'" 1011 [[ -z ${src} ]] && die "Could not locate source for '$1'"
976 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :(" 1012 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
977 1013
978 local shrtsrc="`basename ${src}`" 1014 local shrtsrc=$(basename "${src}")
979 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1015 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
980 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1016 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
981 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"` 1017 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
982 1018
983 # grab metadata for debug reasons 1019 # grab metadata for debug reasons
1047# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1083# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1048# - If the file is not specified then unpack will utilize ${A}. 1084# - If the file is not specified then unpack will utilize ${A}.
1049# - If the offset is not specified then we will attempt to extract 1085# - If the offset is not specified then we will attempt to extract
1050# the proper offset from the script itself. 1086# the proper offset from the script itself.
1051unpack_makeself() { 1087unpack_makeself() {
1088 local src_input=${1:-${A}}
1052 local src=$(find_unpackable_file "$1") 1089 local src=$(find_unpackable_file "${src_input}")
1053 local skip=$2 1090 local skip=$2
1054 local exe=$3 1091 local exe=$3
1055 1092
1056 [[ -z ${src} ]] && die "Could not locate source for '$1'" 1093 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1057 1094
1058 local shrtsrc=$(basename "${src}") 1095 local shrtsrc=$(basename "${src}")
1059 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1096 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1060 if [ -z "${skip}" ] 1097 if [[ -z ${skip} ]] ; then
1061 then
1062 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1098 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1063 local skip=0 1099 local skip=0
1064 exe=tail 1100 exe=tail
1065 case ${ver} in 1101 case ${ver} in
1066 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
1067 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1103 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1079 ;; 1115 ;;
1080 2.1.3) 1116 2.1.3)
1081 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1117 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1082 let skip="skip + 1" 1118 let skip="skip + 1"
1083 ;; 1119 ;;
1084 2.1.4) 1120 2.1.4|2.1.5)
1085 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)
1086 skip=$(head -n ${skip} "${src}" | wc -c) 1122 skip=$(head -n ${skip} "${src}" | wc -c)
1087 exe="dd" 1123 exe="dd"
1088 ;; 1124 ;;
1089 *) 1125 *)
1208 # 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
1209 # the # of files they gave us 1245 # the # of files they gave us
1210 local cdcnt=0 1246 local cdcnt=0
1211 local f= 1247 local f=
1212 for f in "$@" ; do 1248 for f in "$@" ; do
1213 cdcnt=$((cdcnt + 1)) 1249 ((++cdcnt))
1214 export CDROM_CHECK_${cdcnt}="$f" 1250 export CDROM_CHECK_${cdcnt}="$f"
1215 done 1251 done
1216 export CDROM_TOTAL_CDS=${cdcnt} 1252 export CDROM_TOTAL_CDS=${cdcnt}
1217 export CDROM_CURRENT_CD=1 1253 export CDROM_CURRENT_CD=1
1218 1254
1219 # now we see if the user gave use CD_ROOT ... 1255 # now we see if the user gave use CD_ROOT ...
1220 # 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
1221 if [[ ! -z ${CD_ROOT} ]] ; then
1222 export CDROM_ROOT=${CD_ROOT}
1223 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1224 return
1225 fi
1226 # do the same for CD_ROOT_X
1227 if [[ ! -z ${CD_ROOT_1} ]] ; then 1257 if [[ -n ${CD_ROOT}${CD_ROOT_1} ]] ; then
1228 local var= 1258 local var=
1229 cdcnt=0 1259 cdcnt=0
1230 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1260 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1231 cdcnt=$((cdcnt + 1)) 1261 ((++cdcnt))
1232 var="CD_ROOT_${cdcnt}" 1262 var="CD_ROOT_${cdcnt}"
1263 [[ -z ${!var} ]] && var="CD_ROOT"
1233 if [[ -z ${!var} ]] ; then 1264 if [[ -z ${!var} ]] ; then
1234 eerror "You must either use just the CD_ROOT" 1265 eerror "You must either use just the CD_ROOT"
1235 eerror "or specify ALL the CD_ROOT_X variables." 1266 eerror "or specify ALL the CD_ROOT_X variables."
1236 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."
1237 die "could not locate CD_ROOT_${cdcnt}" 1268 die "could not locate CD_ROOT_${cdcnt}"
1238 fi 1269 fi
1239 export CDROM_ROOTS_${cdcnt}="${!var}"
1240 done 1270 done
1241 export CDROM_ROOT=${CDROM_ROOTS_1} 1271 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1242 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}
1243 return 1279 return
1244 fi 1280 fi
1245 1281
1282 # User didn't help us out so lets make sure they know they can
1283 # simplify the whole process ...
1246 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1284 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1247 einfon "This ebuild will need the " 1285 einfo "This ebuild will need the ${CDROM_NAME:-cdrom for ${PN}}"
1248 if [[ -z ${CDROM_NAME} ]] ; then
1249 echo "cdrom for ${PN}."
1250 else
1251 echo "${CDROM_NAME}."
1252 fi
1253 echo 1286 echo
1254 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"
1255 einfo "mounted somewhere on your filesystem, just export" 1288 einfo "mounted somewhere on your filesystem, just export"
1256 einfo "the variable CD_ROOT so that it points to the" 1289 einfo "the variable CD_ROOT so that it points to the"
1257 einfo "directory containing the files." 1290 einfo "directory containing the files."
1261 echo 1294 echo
1262 else 1295 else
1263 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1296 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1264 cdcnt=0 1297 cdcnt=0
1265 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1298 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1266 cdcnt=$((cdcnt + 1)) 1299 ((++cdcnt))
1267 var="CDROM_NAME_${cdcnt}" 1300 var="CDROM_NAME_${cdcnt}"
1268 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}" 1301 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1269 done 1302 done
1270 echo 1303 echo
1271 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"
1272 einfo "mounted somewhere on your filesystem, just export" 1305 einfo "mounted somewhere on your filesystem, just export"
1273 einfo "the following variables so they point to the right place:" 1306 einfo "the following variables so they point to the right place:"
1274 einfon "" 1307 einfon ""
1275 cdcnt=0 1308 cdcnt=0
1276 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1309 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1277 cdcnt=$((cdcnt + 1)) 1310 ((++cdcnt))
1278 echo -n " CD_ROOT_${cdcnt}" 1311 echo -n " CD_ROOT_${cdcnt}"
1279 done 1312 done
1280 echo 1313 echo
1281 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"
1282 einfo "you only have one cdrom, you can export CD_ROOT" 1315 einfo "you only have one cdrom, you can export CD_ROOT"
1285 echo 1318 echo
1286 einfo "For example:" 1319 einfo "For example:"
1287 einfo "export CD_ROOT_1=/mnt/cdrom" 1320 einfo "export CD_ROOT_1=/mnt/cdrom"
1288 echo 1321 echo
1289 fi 1322 fi
1323
1324 export CDROM_SET=""
1290 export CDROM_CURRENT_CD=0 1325 export CDROM_CURRENT_CD=0
1291 cdrom_load_next_cd 1326 cdrom_load_next_cd
1292} 1327}
1293 1328
1294# 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.
1295# 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.
1296# 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.
1297# 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.
1298cdrom_load_next_cd() { 1333cdrom_load_next_cd() {
1299 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1300 local var= 1334 local var
1301 1335 ((++CDROM_CURRENT_CD))
1302 if [[ ! -z ${CD_ROOT} ]] ; then
1303 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1304 return
1305 fi
1306 1336
1307 unset CDROM_ROOT 1337 unset CDROM_ROOT
1308 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1338 var=CD_ROOT_${CDROM_CURRENT_CD}
1339 [[ -z ${!var} ]] && var="CD_ROOT"
1309 if [[ -z ${!var} ]] ; then 1340 if [[ -z ${!var} ]] ; then
1310 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1341 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1311 cdrom_locate_file_on_cd ${!var} 1342 _cdrom_locate_file_on_cd ${!var}
1312 else 1343 else
1313 export CDROM_ROOT=${!var} 1344 export CDROM_ROOT=${!var}
1314 fi 1345 fi
1315 1346
1316 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1347 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1321# 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
1322# 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
1323# displayed and we'll hang out here until: 1354# displayed and we'll hang out here until:
1324# (1) the file is found on a mounted cdrom 1355# (1) the file is found on a mounted cdrom
1325# (2) the user hits CTRL+C 1356# (2) the user hits CTRL+C
1326cdrom_locate_file_on_cd() { 1357_cdrom_locate_file_on_cd() {
1358 local mline=""
1359 local showedmsg=0
1360
1327 while [[ -z ${CDROM_ROOT} ]] ; do 1361 while [[ -z ${CDROM_ROOT} ]] ; do
1328 local dir=$(dirname "$*") 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
1369 local dir=$(dirname ${cdset[${i}]})
1329 local file=$(basename "$*") 1370 local file=$(basename ${cdset[${i}]})
1330 local mline=""
1331 local showedmsg=0
1332 1371
1333 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
1334 [[ -d ${mline}/${dir} ]] || continue 1373 [[ -d ${mline}/${dir} ]] || continue
1335 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \ 1374 if [[ -n $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] ; then
1336 && 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))
1337 done 1383 done
1338 1384
1339 if [[ -z ${CDROM_ROOT} ]] ; then
1340 echo 1385 echo
1341 if [[ ${showedmsg} -eq 0 ]] ; then 1386 if [[ ${showedmsg} -eq 0 ]] ; then
1342 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1387 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1343 if [[ -z ${CDROM_NAME} ]] ; then 1388 if [[ -z ${CDROM_NAME} ]] ; then
1344 einfo "Please insert the cdrom for ${PN} now !" 1389 einfo "Please insert+mount the cdrom for ${PN} now !"
1345 else
1346 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1347 fi
1348 else 1390 else
1349 if [[ -z ${CDROM_NAME_1} ]] ; then
1350 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1351 else
1352 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1353 einfo "Please insert+mount the ${!var} cdrom now !" 1391 einfo "Please insert+mount the ${CDROM_NAME} cdrom now !"
1354 fi
1355 fi 1392 fi
1356 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
1357 fi 1400 fi
1401 showedmsg=1
1402 fi
1358 einfo "Press return to scan for the cd again" 1403 einfo "Press return to scan for the cd again"
1359 einfo "or hit CTRL+C to abort the emerge." 1404 einfo "or hit CTRL+C to abort the emerge."
1360 echo 1405 echo
1361 einfo "If you are having trouble with the detection" 1406 einfo "If you are having trouble with the detection"
1362 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"
1363 einfo "Joliet support enabled in your kernel. Please" 1408 einfo "Joliet support enabled in your kernel. Please"
1364 einfo "check that CONFIG_JOLIET is enabled in your kernel." 1409 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1365 read 1410 read || die "something is screwed with your system"
1366 fi
1367 done 1411 done
1368} 1412}
1369 1413
1370# Make sure that LINGUAS only contains languages that 1414# Make sure that LINGUAS only contains languages that
1371# a package can support 1415# a package can support
1381# directories and uses the union of the lists. 1425# directories and uses the union of the lists.
1382strip-linguas() { 1426strip-linguas() {
1383 local ls newls 1427 local ls newls
1384 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then 1428 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1385 local op=$1; shift 1429 local op=$1; shift
1386 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1430 ls=" $(find "$1" -name '*.po' -exec basename {} \;) "; shift
1387 local d f 1431 local d f
1388 for d in "$@" ; do 1432 for d in "$@" ; do
1389 if [[ ${op} == "-u" ]] ; then 1433 if [[ ${op} == "-u" ]] ; then
1390 newls=${ls} 1434 newls=${ls}
1391 else 1435 else
1392 newls="" 1436 newls=""
1393 fi 1437 fi
1394 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1438 for f in $(find "$d" -name '*.po' -exec basename {} \;) ; do
1395 if [[ ${op} == "-i" ]] ; then 1439 if [[ ${op} == "-i" ]] ; then
1396 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}" 1440 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}"
1397 else 1441 else
1398 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}" 1442 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}"
1399 fi 1443 fi
1455 1499
1456# Jeremy Huddleston <eradicator@gentoo.org>: 1500# Jeremy Huddleston <eradicator@gentoo.org>:
1457# preserve_old_lib /path/to/libblah.so.0 1501# preserve_old_lib /path/to/libblah.so.0
1458# preserve_old_lib_notify /path/to/libblah.so.0 1502# preserve_old_lib_notify /path/to/libblah.so.0
1459# 1503#
1460# These functions are useful when a lib in your package changes --soname. Such 1504# These functions are useful when a lib in your package changes --library. Such
1461# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0 1505# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0
1462# would break packages that link against it. Most people get around this 1506# would break packages that link against it. Most people get around this
1463# by using the portage SLOT mechanism, but that is not always a relevant 1507# by using the portage SLOT mechanism, but that is not always a relevant
1464# solution, so instead you can add the following to your ebuilds: 1508# solution, so instead you can add the following to your ebuilds:
1465# 1509#
1496 1540
1497 ewarn "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."
1498 ewarn "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"
1499 ewarn "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,"
1500 ewarn "you will need to execute the following command:" 1544 ewarn "you will need to execute the following command:"
1501 ewarn " revdep-rebuild --soname ${SONAME}" 1545 ewarn " revdep-rebuild --library ${SONAME}"
1502 ewarn 1546 ewarn
1503 ewarn "After doing that, you can safely remove ${LIB}" 1547 ewarn "After doing that, you can safely remove ${LIB}"
1504 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild" 1548 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1505 fi 1549 fi
1506} 1550}
1519 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1563 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1520 1564
1521 local PKG=$(best_version $1) 1565 local PKG=$(best_version $1)
1522 shift 1566 shift
1523 1567
1524 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
1525 [[ ! -e ${USEFILE} ]] && return 1 1572 [[ ! -e ${USEFILE} ]] && return 0
1526 1573
1527 local USE_BUILT=$(<${USEFILE}) 1574 local USE_BUILT=$(<${USEFILE})
1528 while [[ $# -gt 0 ]] ; do 1575 while [[ $# -gt 0 ]] ; do
1529 if [[ ${opt} = "-o" ]] ; then 1576 if [[ ${opt} = "-o" ]] ; then
1530 has $1 ${USE_BUILT} && return 0 1577 has $1 ${USE_BUILT} && return 0
1582# $4 == extra LD_LIBRARY_PATH's (make it : delimited) 1629# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1583# $5 == path for wrapper 1630# $5 == path for wrapper
1584make_wrapper() { 1631make_wrapper() {
1585 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5 1632 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1586 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"
1587 cat << EOF > "${tmpwrapper}" 1636 cat << EOF > "${tmpwrapper}"
1588#!/bin/sh 1637#!/bin/sh
1589cd "${chdir}" 1638cd "${chdir:-.}"
1639if [ -n "${libdir}" ] ; then
1640 if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
1590export 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
1591exec ${bin} "\$@" 1646exec ${bin} "\$@"
1592EOF 1647EOF
1593 chmod go+rx "${tmpwrapper}" 1648 chmod go+rx "${tmpwrapper}"
1594 if [ -n "${5}" ] 1649 if [[ -n ${path} ]] ; then
1595 then
1596 exeinto ${5} 1650 exeinto "${path}"
1597 newexe "${tmpwrapper}" "${wrapper}" 1651 newexe "${tmpwrapper}" "${wrapper}"
1598 else 1652 else
1599 newbin "${tmpwrapper}" "${wrapper}" 1653 newbin "${tmpwrapper}" "${wrapper}"
1600 fi 1654 fi
1601} 1655}

Legend:
Removed from v.1.200  
changed lines
  Added in v.1.232

  ViewVC Help
Powered by ViewVC 1.1.20