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

Diff of /eclass/eutils.eclass

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

Revision 1.206 Revision 1.240
1# Copyright 1999-2005 Gentoo Foundation 1# Copyright 1999-2006 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.206 2005/10/07 16:21:48 flameeyes Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.240 2006/06/09 15:36:40 wolf31o2 Exp $
4#
5# Author: Martin Schlemmer <azarah@gentoo.org>
6# 4#
7# This eclass is for general purpose functions that most ebuilds 5# This eclass is for general purpose functions that most ebuilds
8# have to implement themselves. 6# have to implement themselves.
9# 7#
10# NB: If you add anything, please comment it! 8# NB: If you add anything, please comment it!
11 9
12inherit multilib portability 10inherit multilib portability
13
14DEPEND="!bootstrap? ( sys-devel/patch )"
15# sys-apps/shadow is needed for useradd, etc, bug #94745.
16 11
17DESCRIPTION="Based on the ${ECLASS} eclass" 12DESCRIPTION="Based on the ${ECLASS} eclass"
18 13
19# Wait for the supplied number of seconds. If no argument is supplied, defaults 14# Wait for the supplied number of seconds. If no argument is supplied, defaults
20# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not 15# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not
60# to point to the latest version of the library present. 55# to point to the latest version of the library present.
61# 56#
62# <azarah@gentoo.org> (26 Oct 2002) 57# <azarah@gentoo.org> (26 Oct 2002)
63# 58#
64gen_usr_ldscript() { 59gen_usr_ldscript() {
65 local libdir="$(get_libdir)" 60 local lib libdir=$(get_libdir)
66 # Just make sure it exists 61 # Just make sure it exists
67 dodir /usr/${libdir} 62 dodir /usr/${libdir}
68 63
69 for lib in "${@}" ; do 64 for lib in "${@}" ; do
70 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT 65 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT
76 71
77 See bug http://bugs.gentoo.org/4411 for more info. 72 See bug http://bugs.gentoo.org/4411 for more info.
78 */ 73 */
79 GROUP ( /${libdir}/${lib} ) 74 GROUP ( /${libdir}/${lib} )
80 END_LDSCRIPT 75 END_LDSCRIPT
81 fperms a+x "/usr/${libdir}/${lib}" 76 fperms a+x "/usr/${libdir}/${lib}" || die "could not change perms on ${lib}"
82 done 77 done
83} 78}
84 79
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 80
116# Default directory where patches are located 81# Default directory where patches are located
117EPATCH_SOURCE="${WORKDIR}/patch" 82EPATCH_SOURCE="${WORKDIR}/patch"
118# Default extension for patches 83# Default extension for patches
119EPATCH_SUFFIX="patch.bz2" 84EPATCH_SUFFIX="patch.bz2"
120# Default options for patch 85# Default options for patch
121# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571 86# 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. 87# Set --no-backup-if-mismatch so we don't leave '.orig' files behind.
88# Set -E to automatically remove empty files.
123EPATCH_OPTS="-g0 --no-backup-if-mismatch" 89EPATCH_OPTS="-g0 -E --no-backup-if-mismatch"
124# List of patches not to apply. Not this is only file names, 90# List of patches not to apply. Not this is only file names,
125# and not the full path .. 91# and not the full path ..
126EPATCH_EXCLUDE="" 92EPATCH_EXCLUDE=""
127# Change the printed message for a single patch. 93# Change the printed message for a single patch.
128EPATCH_SINGLE_MSG="" 94EPATCH_SINGLE_MSG=""
166# hand its a directory, it will set EPATCH_SOURCE to this. 132# hand its a directory, it will set EPATCH_SOURCE to this.
167# 133#
168# <azarah@gentoo.org> (10 Nov 2002) 134# <azarah@gentoo.org> (10 Nov 2002)
169# 135#
170epatch() { 136epatch() {
137 _epatch_draw_line() {
138 [[ -z $1 ]] && set "$(printf "%65s" '')"
139 echo "${1//?/=}"
140 }
141 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; }
171 local PIPE_CMD="" 142 local PIPE_CMD=""
172 local STDERR_TARGET="${T}/$$.out" 143 local STDERR_TARGET="${T}/$$.out"
173 local PATCH_TARGET="${T}/$$.patch" 144 local PATCH_TARGET="${T}/$$.patch"
174 local PATCH_SUFFIX="" 145 local PATCH_SUFFIX=""
175 local SINGLE_PATCH="no" 146 local SINGLE_PATCH="no"
284 255
285 # Allow for prefix to differ ... im lazy, so shoot me :/ 256 # Allow for prefix to differ ... im lazy, so shoot me :/
286 while [ "${count}" -lt 5 ] 257 while [ "${count}" -lt 5 ]
287 do 258 do
288 # Generate some useful debug info ... 259 # Generate some useful debug info ...
289 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 260 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
290 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 261 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
291 262
292 if [ "${PATCH_SUFFIX}" != "patch" ] 263 if [ "${PATCH_SUFFIX}" != "patch" ]
293 then 264 then
294 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 265 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
299 270
300 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 271 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
301 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 272 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
302 273
303 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 274 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
304 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 275 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
305 276
306 if [ "${PATCH_SUFFIX}" != "patch" ] 277 if [ "${PATCH_SUFFIX}" != "patch" ]
307 then 278 then
308 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1 279 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
309 then 280 then
313 count=5 284 count=5
314 break 285 break
315 fi 286 fi
316 fi 287 fi
317 288
318 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1 289 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f ; _epatch_assert) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
319 then 290 then
320 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 291 _epatch_draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
321 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 292 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
322 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 293 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
323 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 294 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
324 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 295 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
325 296
326 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1 297 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
298 _epatch_assert
327 299
328 if [ "$?" -ne 0 ] 300 if [ "$?" -ne 0 ]
329 then 301 then
330 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 302 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
331 echo 303 echo
394 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM} 366 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
395 done 367 done
396 ${exe} "${tmp}" || ${exe} -p "${tmp}" 368 ${exe} "${tmp}" || ${exe} -p "${tmp}"
397 echo "${tmp}" 369 echo "${tmp}"
398 else 370 else
399 [[ ${exe} == "touch" ]] \ 371 if [[ ${exe} == "touch" ]] ; then
400 && exe="-p" \ 372 [[ ${USERLAND} == "GNU" ]] \
401 || exe="-d" 373 && mktemp -p "${topdir}" \
402 mktemp ${exe} "${topdir}" 374 || TMPDIR="${topdir}" mktemp -t tmp
375 else
376 [[ ${USERLAND} == "GNU" ]] \
377 && mktemp -d "${topdir}" \
378 || TMPDIR="${topdir}" mktemp -dt tmp
379 fi
403 fi 380 fi
404} 381}
405 382
406# Small wrapper for getent (Linux), nidump (Mac OS X), 383# Small wrapper for getent (Linux), nidump (Mac OS X),
407# and pw (FreeBSD) used in enewuser()/enewgroup() 384# and pw (FreeBSD) used in enewuser()/enewgroup()
419 *) # Numeric 396 *) # Numeric
420 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 397 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
421 ;; 398 ;;
422 esac 399 esac
423 ;; 400 ;;
424 *-freebsd*) 401 *-freebsd*|*-dragonfly*)
425 local opts action="user" 402 local opts action="user"
426 [[ $1 == "passwd" ]] || action="group" 403 [[ $1 == "passwd" ]] || action="group"
427 404
428 # lookup by uid/gid 405 # lookup by uid/gid
429 if [[ $2 == [[:digit:]]* ]] ; then 406 if [[ $2 == [[:digit:]]* ]] ; then
430 [[ ${action} == "user" ]] && opts="-u" || opts="-g" 407 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
431 fi 408 fi
432 409
433 pw show ${action} ${opts} "$2" -q 410 pw show ${action} ${opts} "$2" -q
434 ;; 411 ;;
435 *-netbsd*) 412 *-netbsd*|*-openbsd*)
436 grep "$2:\*:" /etc/$1 413 grep "$2:\*:" /etc/$1
437 ;; 414 ;;
438 *) 415 *)
439 type -p nscd >& /dev/null && nscd -i "$1" 416 type -p nscd >& /dev/null && nscd -i "$1"
440 getent "$1" "$2" 417 getent "$1" "$2"
454# shell: /bin/false 431# shell: /bin/false
455# homedir: /dev/null 432# homedir: /dev/null
456# groups: none 433# groups: none
457# extra: comment of 'added by portage for ${PN}' 434# extra: comment of 'added by portage for ${PN}'
458enewuser() { 435enewuser() {
436 case ${EBUILD_PHASE} in
437 unpack|compile|test|install)
438 eerror "'enewuser()' called from '${EBUILD_PHASE}()' which is not a pkg_* function."
439 eerror "Package fails at QA and at life. Please file a bug."
440 die "Bad package! enewuser is only for use in pkg_* functions!"
441 esac
442
459 # get the username 443 # get the username
460 local euser=$1; shift 444 local euser=$1; shift
461 if [[ -z ${euser} ]] ; then 445 if [[ -z ${euser} ]] ; then
462 eerror "No username specified !" 446 eerror "No username specified !"
463 die "Cannot call enewuser without a username" 447 die "Cannot call enewuser without a username"
495 einfo " - Userid: ${euid}" 479 einfo " - Userid: ${euid}"
496 480
497 # handle shell 481 # handle shell
498 local eshell=$1; shift 482 local eshell=$1; shift
499 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then 483 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
500 if [[ ! -e ${eshell} ]] ; then 484 if [[ ! -e ${ROOT}${eshell} ]] ; then
501 eerror "A shell was specified but it does not exist !" 485 eerror "A shell was specified but it does not exist !"
502 die "${eshell} does not exist" 486 die "${eshell} does not exist in ${ROOT}"
487 fi
488 if [[ ${eshell} == */false || ${eshell} == */nologin ]] ; then
489 eerror "Do not specify ${eshell} yourself, use -1"
490 die "Pass '-1' as the shell parameter"
503 fi 491 fi
504 else 492 else
505 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do 493 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
506 [[ -x ${ROOT}${shell} ]] && break 494 [[ -x ${ROOT}${shell} ]] && break
507 done 495 done
578 einfo "Please report the ebuild along with the info below" 566 einfo "Please report the ebuild along with the info below"
579 einfo "eextra: $@" 567 einfo "eextra: $@"
580 die "Required function missing" 568 die "Required function missing"
581 fi 569 fi
582 ;; 570 ;;
583 *-freebsd*) 571 *-freebsd*|*-dragonfly*)
584 if [[ -z $@ ]] ; then 572 if [[ -z $@ ]] ; then
585 pw useradd ${euser} ${opts} \ 573 pw useradd ${euser} ${opts} \
586 -c "added by portage for ${PN}" \ 574 -c "added by portage for ${PN}" \
587 die "enewuser failed" 575 die "enewuser failed"
588 else 576 else
589 einfo " - Extra: $@" 577 einfo " - Extra: $@"
590 pw useradd ${euser} ${opts} \ 578 pw useradd ${euser} ${opts} \
591 "$@" || die "enewuser failed" 579 "$@" || die "enewuser failed"
592 fi 580 fi
593 ;; 581 ;;
582
583 *-netbsd*)
584 if [[ -z $@ ]] ; then
585 useradd ${opts} ${euser} || die "enewuser failed"
586 else
587 einfo " - Extra: $@"
588 useradd ${opts} ${euser} "$@" || die "enewuser failed"
589 fi
590 ;;
591
592 *-openbsd*)
593 if [[ -z $@ ]] ; then
594 useradd -u ${euid} -s ${eshell} \
595 -d ${ehome} -c "Added by portage for ${PN}" \
596 -g ${egroups} ${euser} || die "enewuser failed"
597 else
598 einfo " - Extra: $@"
599 useradd -u ${euid} -s ${eshell} \
600 -d ${ehome} -c "Added by portage for ${PN}" \
601 -g ${egroups} ${euser} "$@" || die "enewuser failed"
602 fi
603 ;;
604
594 *) 605 *)
595 if [[ -z $@ ]] ; then 606 if [[ -z $@ ]] ; then
596 useradd ${opts} ${euser} \ 607 useradd ${opts} ${euser} \
597 -c "added by portage for ${PN}" \ 608 -c "added by portage for ${PN}" \
598 || die "enewuser failed" 609 || die "enewuser failed"
622# Default values if you do not specify any: 633# Default values if you do not specify any:
623# groupname: REQUIRED ! 634# groupname: REQUIRED !
624# gid: next available (see groupadd(8)) 635# gid: next available (see groupadd(8))
625# extra: none 636# extra: none
626enewgroup() { 637enewgroup() {
638 case ${EBUILD_PHASE} in
639 unpack|compile|test|install)
640 eerror "'enewgroup()' called from '${EBUILD_PHASE}()' which is not a pkg_* function."
641 eerror "Package fails at QA and at life. Please file a bug."
642 die "Bad package! enewgroup is only for use in pkg_* functions!"
643 esac
644
627 # get the group 645 # get the group
628 local egroup="$1"; shift 646 local egroup="$1"; shift
629 if [ -z "${egroup}" ] 647 if [ -z "${egroup}" ]
630 then 648 then
631 eerror "No group specified !" 649 eerror "No group specified !"
693 esac 711 esac
694 dscl . create /groups/${egroup} gid ${egid} 712 dscl . create /groups/${egroup} gid ${egid}
695 dscl . create /groups/${egroup} passwd '*' 713 dscl . create /groups/${egroup} passwd '*'
696 ;; 714 ;;
697 715
698 *-freebsd*) 716 *-freebsd*|*-dragonfly*)
699 case ${egid} in 717 case ${egid} in
700 *[!0-9]*) # Non numeric 718 *[!0-9]*) # Non numeric
701 for egid in $(seq 101 999); do 719 for egid in $(seq 101 999); do
702 [ -z "`egetent group ${egid}`" ] && break 720 [ -z "`egetent group ${egid}`" ] && break
703 done 721 done
710 *[!0-9]*) # Non numeric 728 *[!0-9]*) # Non numeric
711 for egid in $(seq 101 999); do 729 for egid in $(seq 101 999); do
712 [ -z "`egetent group ${egid}`" ] && break 730 [ -z "`egetent group ${egid}`" ] && break
713 done 731 done
714 esac 732 esac
715 groupadd ${egroup} -g ${egid} || die "enewgroup failed" 733 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
716 ;; 734 ;;
717 735
718 *) 736 *)
719 groupadd ${opts} ${egroup} || die "enewgroup failed" 737 groupadd ${opts} ${egroup} || die "enewgroup failed"
720 ;; 738 ;;
743 761
744# Make a desktop file ! 762# Make a desktop file !
745# Great for making those icons in kde/gnome startmenu ! 763# Great for making those icons in kde/gnome startmenu !
746# Amaze your friends ! Get the women ! Join today ! 764# Amaze your friends ! Get the women ! Join today !
747# 765#
748# make_desktop_entry(<binary>, [name], [icon], [type], [path]) 766# make_desktop_entry(<command>, [name], [icon], [type], [path])
749# 767#
750# binary: what binary does the app run with ? 768# binary: what command does the app run with ?
751# name: the name that will show up in the menu 769# name: the name that will show up in the menu
752# icon: give your little like a pretty little icon ... 770# icon: give your little like a pretty little icon ...
753# this can be relative (to /usr/share/pixmaps) or 771# this can be relative (to /usr/share/pixmaps) or
754# a full path to an icon 772# a full path to an icon
755# type: what kind of application is this ? for categories: 773# type: what kind of application is this ? for categories:
837 type="Network;${type}" 855 type="Network;${type}"
838 ;; 856 ;;
839 857
840 sci) 858 sci)
841 case ${catmin} in 859 case ${catmin} in
842 astro*) type=Astronomoy;; 860 astro*) type=Astronomy;;
843 bio*) type=Biology;; 861 bio*) type=Biology;;
844 calc*) type=Calculator;; 862 calc*) type=Calculator;;
845 chem*) type=Chemistry;; 863 chem*) type=Chemistry;;
846 geo*) type=Geology;; 864 geo*) type=Geology;;
847 math*) type=Math;; 865 math*) type=Math;;
867 local desktop_name="${PN}" 885 local desktop_name="${PN}"
868 else 886 else
869 local desktop_name="${PN}-${SLOT}" 887 local desktop_name="${PN}-${SLOT}"
870 fi 888 fi
871 local desktop=${T}/${exec%% *}-${desktop_name}.desktop 889 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
890# local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
872 891
873echo "[Desktop Entry] 892echo "[Desktop Entry]
874Encoding=UTF-8 893Encoding=UTF-8
875Version=0.9.2 894Version=0.9.2
876Name=${name} 895Name=${name}
877Type=Application 896Type=Application
878Comment=${DESCRIPTION} 897Comment=${DESCRIPTION}
879Exec=${exec} 898Exec=${exec}
899TryExec=${exec%% *}
880Path=${path} 900Path=${path}
881Icon=${icon} 901Icon=${icon}
882Categories=Application;${type};" > "${desktop}" 902Categories=Application;${type};" > "${desktop}"
883 903
884 ( 904 (
999 local sizeoff_t=$2 1019 local sizeoff_t=$2
1000 1020
1001 [[ -z ${src} ]] && die "Could not locate source for '$1'" 1021 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1002 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :(" 1022 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
1003 1023
1004 local shrtsrc="`basename ${src}`" 1024 local shrtsrc=$(basename "${src}")
1005 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1025 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1006 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1026 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
1007 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"` 1027 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
1008 1028
1009 # grab metadata for debug reasons 1029 # grab metadata for debug reasons
1073# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1093# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1074# - If the file is not specified then unpack will utilize ${A}. 1094# - If the file is not specified then unpack will utilize ${A}.
1075# - If the offset is not specified then we will attempt to extract 1095# - If the offset is not specified then we will attempt to extract
1076# the proper offset from the script itself. 1096# the proper offset from the script itself.
1077unpack_makeself() { 1097unpack_makeself() {
1098 local src_input=${1:-${A}}
1078 local src=$(find_unpackable_file "$1") 1099 local src=$(find_unpackable_file "${src_input}")
1079 local skip=$2 1100 local skip=$2
1080 local exe=$3 1101 local exe=$3
1081 1102
1082 [[ -z ${src} ]] && die "Could not locate source for '$1'" 1103 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1083 1104
1084 local shrtsrc=$(basename "${src}") 1105 local shrtsrc=$(basename "${src}")
1085 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1106 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1086 if [ -z "${skip}" ] 1107 if [[ -z ${skip} ]] ; then
1087 then
1088 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1108 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1089 local skip=0 1109 local skip=0
1090 exe=tail 1110 exe=tail
1091 case ${ver} in 1111 case ${ver} in
1092 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1112 1.5.*|1.6.0-nv) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
1093 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1113 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1094 ;; 1114 ;;
1095 2.0|2.0.1) 1115 2.0|2.0.1)
1096 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-) 1116 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-)
1097 ;; 1117 ;;
1105 ;; 1125 ;;
1106 2.1.3) 1126 2.1.3)
1107 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1127 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1108 let skip="skip + 1" 1128 let skip="skip + 1"
1109 ;; 1129 ;;
1110 2.1.4) 1130 2.1.4|2.1.5)
1111 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1) 1131 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
1112 skip=$(head -n ${skip} "${src}" | wc -c) 1132 skip=$(head -n ${skip} "${src}" | wc -c)
1113 exe="dd" 1133 exe="dd"
1114 ;; 1134 ;;
1115 *) 1135 *)
1234 # first we figure out how many cds we're dealing with by 1254 # first we figure out how many cds we're dealing with by
1235 # the # of files they gave us 1255 # the # of files they gave us
1236 local cdcnt=0 1256 local cdcnt=0
1237 local f= 1257 local f=
1238 for f in "$@" ; do 1258 for f in "$@" ; do
1239 cdcnt=$((cdcnt + 1)) 1259 ((++cdcnt))
1240 export CDROM_CHECK_${cdcnt}="$f" 1260 export CDROM_CHECK_${cdcnt}="$f"
1241 done 1261 done
1242 export CDROM_TOTAL_CDS=${cdcnt} 1262 export CDROM_TOTAL_CDS=${cdcnt}
1243 export CDROM_CURRENT_CD=1 1263 export CDROM_CURRENT_CD=1
1244 1264
1245 # now we see if the user gave use CD_ROOT ... 1265 # now we see if the user gave use CD_ROOT ...
1246 # if they did, let's just believe them that it's correct 1266 # if they did, let's just believe them that it's correct
1247 if [[ ! -z ${CD_ROOT} ]] ; then
1248 export CDROM_ROOT=${CD_ROOT}
1249 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1250 return
1251 fi
1252 # do the same for CD_ROOT_X
1253 if [[ ! -z ${CD_ROOT_1} ]] ; then 1267 if [[ -n ${CD_ROOT}${CD_ROOT_1} ]] ; then
1254 local var= 1268 local var=
1255 cdcnt=0 1269 cdcnt=0
1256 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1270 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1257 cdcnt=$((cdcnt + 1)) 1271 ((++cdcnt))
1258 var="CD_ROOT_${cdcnt}" 1272 var="CD_ROOT_${cdcnt}"
1273 [[ -z ${!var} ]] && var="CD_ROOT"
1259 if [[ -z ${!var} ]] ; then 1274 if [[ -z ${!var} ]] ; then
1260 eerror "You must either use just the CD_ROOT" 1275 eerror "You must either use just the CD_ROOT"
1261 eerror "or specify ALL the CD_ROOT_X variables." 1276 eerror "or specify ALL the CD_ROOT_X variables."
1262 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables." 1277 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."
1263 die "could not locate CD_ROOT_${cdcnt}" 1278 die "could not locate CD_ROOT_${cdcnt}"
1264 fi 1279 fi
1265 export CDROM_ROOTS_${cdcnt}="${!var}"
1266 done 1280 done
1267 export CDROM_ROOT=${CDROM_ROOTS_1} 1281 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1268 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1282 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1283 export CDROM_SET=-1
1284 for f in ${CDROM_CHECK_1//:/ } ; do
1285 ((++CDROM_SET))
1286 [[ -e ${CD_ROOT}/${f} ]] && break
1287 done
1288 export CDROM_MATCH=${f}
1269 return 1289 return
1270 fi 1290 fi
1271 1291
1292 # User didn't help us out so lets make sure they know they can
1293 # simplify the whole process ...
1272 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1294 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1273 einfon "This ebuild will need the " 1295 einfo "This ebuild will need the ${CDROM_NAME:-cdrom for ${PN}}"
1274 if [[ -z ${CDROM_NAME} ]] ; then
1275 echo "cdrom for ${PN}."
1276 else
1277 echo "${CDROM_NAME}."
1278 fi
1279 echo 1296 echo
1280 einfo "If you do not have the CD, but have the data files" 1297 einfo "If you do not have the CD, but have the data files"
1281 einfo "mounted somewhere on your filesystem, just export" 1298 einfo "mounted somewhere on your filesystem, just export"
1282 einfo "the variable CD_ROOT so that it points to the" 1299 einfo "the variable CD_ROOT so that it points to the"
1283 einfo "directory containing the files." 1300 einfo "directory containing the files."
1287 echo 1304 echo
1288 else 1305 else
1289 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1306 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1290 cdcnt=0 1307 cdcnt=0
1291 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1308 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1292 cdcnt=$((cdcnt + 1)) 1309 ((++cdcnt))
1293 var="CDROM_NAME_${cdcnt}" 1310 var="CDROM_NAME_${cdcnt}"
1294 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}" 1311 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1295 done 1312 done
1296 echo 1313 echo
1297 einfo "If you do not have the CDs, but have the data files" 1314 einfo "If you do not have the CDs, but have the data files"
1298 einfo "mounted somewhere on your filesystem, just export" 1315 einfo "mounted somewhere on your filesystem, just export"
1299 einfo "the following variables so they point to the right place:" 1316 einfo "the following variables so they point to the right place:"
1300 einfon "" 1317 einfon ""
1301 cdcnt=0 1318 cdcnt=0
1302 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1319 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1303 cdcnt=$((cdcnt + 1)) 1320 ((++cdcnt))
1304 echo -n " CD_ROOT_${cdcnt}" 1321 echo -n " CD_ROOT_${cdcnt}"
1305 done 1322 done
1306 echo 1323 echo
1307 einfo "Or, if you have all the files in the same place, or" 1324 einfo "Or, if you have all the files in the same place, or"
1308 einfo "you only have one cdrom, you can export CD_ROOT" 1325 einfo "you only have one cdrom, you can export CD_ROOT"
1311 echo 1328 echo
1312 einfo "For example:" 1329 einfo "For example:"
1313 einfo "export CD_ROOT_1=/mnt/cdrom" 1330 einfo "export CD_ROOT_1=/mnt/cdrom"
1314 echo 1331 echo
1315 fi 1332 fi
1333
1334 export CDROM_SET=""
1316 export CDROM_CURRENT_CD=0 1335 export CDROM_CURRENT_CD=0
1317 cdrom_load_next_cd 1336 cdrom_load_next_cd
1318} 1337}
1319 1338
1320# this is only used when you need access to more than one cd. 1339# this is only used when you need access to more than one cd.
1321# when you have finished using the first cd, just call this function. 1340# when you have finished using the first cd, just call this function.
1322# when it returns, CDROM_ROOT will be pointing to the second cd. 1341# when it returns, CDROM_ROOT will be pointing to the second cd.
1323# remember, you can only go forward in the cd chain, you can't go back. 1342# remember, you can only go forward in the cd chain, you can't go back.
1324cdrom_load_next_cd() { 1343cdrom_load_next_cd() {
1325 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1326 local var= 1344 local var
1327 1345 ((++CDROM_CURRENT_CD))
1328 if [[ ! -z ${CD_ROOT} ]] ; then
1329 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1330 return
1331 fi
1332 1346
1333 unset CDROM_ROOT 1347 unset CDROM_ROOT
1334 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1348 var=CD_ROOT_${CDROM_CURRENT_CD}
1349 [[ -z ${!var} ]] && var="CD_ROOT"
1335 if [[ -z ${!var} ]] ; then 1350 if [[ -z ${!var} ]] ; then
1336 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1351 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1337 cdrom_locate_file_on_cd ${!var} 1352 _cdrom_locate_file_on_cd ${!var}
1338 else 1353 else
1339 export CDROM_ROOT=${!var} 1354 export CDROM_ROOT=${!var}
1340 fi 1355 fi
1341 1356
1342 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1357 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1347# all it does is try to locate a give file on a cd ... if the cd isn't 1362# all it does is try to locate a give file on a cd ... if the cd isn't
1348# found, then a message asking for the user to insert the cdrom will be 1363# found, then a message asking for the user to insert the cdrom will be
1349# displayed and we'll hang out here until: 1364# displayed and we'll hang out here until:
1350# (1) the file is found on a mounted cdrom 1365# (1) the file is found on a mounted cdrom
1351# (2) the user hits CTRL+C 1366# (2) the user hits CTRL+C
1352cdrom_locate_file_on_cd() { 1367_cdrom_locate_file_on_cd() {
1368 local mline=""
1369 local showedmsg=0
1370
1353 while [[ -z ${CDROM_ROOT} ]] ; do 1371 while [[ -z ${CDROM_ROOT} ]] ; do
1354 local dir=$(dirname "$*") 1372 local i=0
1373 local -a cdset=(${*//:/ })
1374 if [[ -n ${CDROM_SET} ]] ; then
1375 cdset=(${cdset[${CDROM_SET}]})
1376 fi
1377
1378 while [[ -n ${cdset[${i}]} ]] ; do
1379 local dir=$(dirname ${cdset[${i}]})
1355 local file=$(basename "$*") 1380 local file=$(basename ${cdset[${i}]})
1356 local mline=""
1357 local showedmsg=0
1358 1381
1359 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1382 for mline in $(mount | gawk '/(iso|cdrom|fs=cdfss)/ {print $3}') ; do
1360 [[ -d ${mline}/${dir} ]] || continue 1383 [[ -d ${mline}/${dir} ]] || continue
1361 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \ 1384 if [[ -n $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] ; then
1362 && export CDROM_ROOT=${mline} 1385 export CDROM_ROOT=${mline}
1386 export CDROM_SET=${i}
1387 export CDROM_MATCH=${cdset[${i}]}
1388 return
1389 fi
1390 done
1391
1392 ((++i))
1363 done 1393 done
1364 1394
1365 if [[ -z ${CDROM_ROOT} ]] ; then
1366 echo 1395 echo
1367 if [[ ${showedmsg} -eq 0 ]] ; then 1396 if [[ ${showedmsg} -eq 0 ]] ; then
1368 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1397 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1369 if [[ -z ${CDROM_NAME} ]] ; then 1398 if [[ -z ${CDROM_NAME} ]] ; then
1370 einfo "Please insert the cdrom for ${PN} now !" 1399 einfo "Please insert+mount the cdrom for ${PN} now !"
1371 else
1372 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1373 fi
1374 else 1400 else
1375 if [[ -z ${CDROM_NAME_1} ]] ; then
1376 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1377 else
1378 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1379 einfo "Please insert+mount the ${!var} cdrom now !" 1401 einfo "Please insert+mount the ${CDROM_NAME} cdrom now !"
1380 fi
1381 fi 1402 fi
1382 showedmsg=1 1403 else
1404 if [[ -z ${CDROM_NAME_1} ]] ; then
1405 einfo "Please insert+mount cd #${CDROM_CURRENT_CD} for ${PN} now !"
1406 else
1407 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1408 einfo "Please insert+mount the ${!var} cdrom now !"
1409 fi
1383 fi 1410 fi
1411 showedmsg=1
1412 fi
1384 einfo "Press return to scan for the cd again" 1413 einfo "Press return to scan for the cd again"
1385 einfo "or hit CTRL+C to abort the emerge." 1414 einfo "or hit CTRL+C to abort the emerge."
1386 echo 1415 echo
1387 einfo "If you are having trouble with the detection" 1416 einfo "If you are having trouble with the detection"
1388 einfo "of your CD, it is possible that you do not have" 1417 einfo "of your CD, it is possible that you do not have"
1389 einfo "Joliet support enabled in your kernel. Please" 1418 einfo "Joliet support enabled in your kernel. Please"
1390 einfo "check that CONFIG_JOLIET is enabled in your kernel." 1419 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1391 read 1420 read || die "something is screwed with your system"
1392 fi
1393 done 1421 done
1394} 1422}
1395 1423
1396# Make sure that LINGUAS only contains languages that 1424# Make sure that LINGUAS only contains languages that
1397# a package can support 1425# a package can support
1407# directories and uses the union of the lists. 1435# directories and uses the union of the lists.
1408strip-linguas() { 1436strip-linguas() {
1409 local ls newls 1437 local ls newls
1410 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then 1438 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1411 local op=$1; shift 1439 local op=$1; shift
1412 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1440 ls=$(find "$1" -name '*.po' -exec basename {} .po \;); shift
1413 local d f 1441 local d f
1414 for d in "$@" ; do 1442 for d in "$@" ; do
1415 if [[ ${op} == "-u" ]] ; then 1443 if [[ ${op} == "-u" ]] ; then
1416 newls=${ls} 1444 newls=${ls}
1417 else 1445 else
1418 newls="" 1446 newls=""
1419 fi 1447 fi
1420 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1448 for f in $(find "$d" -name '*.po' -exec basename {} .po \;) ; do
1421 if [[ ${op} == "-i" ]] ; then 1449 if [[ ${op} == "-i" ]] ; then
1422 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}" 1450 hasq ${f} ${ls} && newls="${newls} ${f}"
1423 else 1451 else
1424 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}" 1452 hasq ${f} ${ls} || newls="${newls} ${f}"
1425 fi 1453 fi
1426 done 1454 done
1427 ls=${newls} 1455 ls=${newls}
1428 done 1456 done
1429 ls=${ls//.po}
1430 else 1457 else
1431 ls=$@ 1458 ls="$@"
1432 fi 1459 fi
1433 1460
1434 ls=" ${ls} "
1435 newls="" 1461 newls=""
1436 for f in ${LINGUAS} ; do 1462 for f in ${LINGUAS} ; do
1437 if [[ ${ls/ ${f} /} != ${ls} ]] ; then 1463 if hasq ${f} ${ls} ; then
1438 newls="${newls} ${f}" 1464 newls="${newls} ${f}"
1439 else 1465 else
1440 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1466 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA"
1441 fi 1467 fi
1442 done 1468 done
1443 if [[ -z ${newls} ]] ; then
1444 export LINGUAS=""
1445 else
1446 export LINGUAS=${newls:1} 1469 export LINGUAS=${newls:1}
1447 fi
1448} 1470}
1449 1471
1450# moved from kernel.eclass since they are generally useful outside of 1472# moved from kernel.eclass since they are generally useful outside of
1451# kernel.eclass -iggy (20041002) 1473# kernel.eclass -iggy (20041002)
1452 1474
1481 1503
1482# Jeremy Huddleston <eradicator@gentoo.org>: 1504# Jeremy Huddleston <eradicator@gentoo.org>:
1483# preserve_old_lib /path/to/libblah.so.0 1505# preserve_old_lib /path/to/libblah.so.0
1484# preserve_old_lib_notify /path/to/libblah.so.0 1506# preserve_old_lib_notify /path/to/libblah.so.0
1485# 1507#
1486# These functions are useful when a lib in your package changes --soname. Such 1508# These functions are useful when a lib in your package changes --library. Such
1487# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0 1509# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0
1488# would break packages that link against it. Most people get around this 1510# would break packages that link against it. Most people get around this
1489# by using the portage SLOT mechanism, but that is not always a relevant 1511# by using the portage SLOT mechanism, but that is not always a relevant
1490# solution, so instead you can add the following to your ebuilds: 1512# solution, so instead you can add the following to your ebuilds:
1491# 1513#
1522 1544
1523 ewarn "An old version of an installed library was detected on your system." 1545 ewarn "An old version of an installed library was detected on your system."
1524 ewarn "In order to avoid breaking packages that link against it, this older version" 1546 ewarn "In order to avoid breaking packages that link against it, this older version"
1525 ewarn "is not being removed. In order to make full use of this newer version," 1547 ewarn "is not being removed. In order to make full use of this newer version,"
1526 ewarn "you will need to execute the following command:" 1548 ewarn "you will need to execute the following command:"
1527 ewarn " revdep-rebuild --soname ${SONAME}" 1549 ewarn " revdep-rebuild --library ${SONAME}"
1528 ewarn 1550 ewarn
1529 ewarn "After doing that, you can safely remove ${LIB}" 1551 ewarn "After doing that, you can safely remove ${LIB}"
1530 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild" 1552 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1531 fi 1553 fi
1532} 1554}
1545 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1567 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1546 1568
1547 local PKG=$(best_version $1) 1569 local PKG=$(best_version $1)
1548 shift 1570 shift
1549 1571
1550 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE" 1572 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
1573
1574 # if the USE file doesnt exist, assume the $PKG is either
1575 # injected or package.provided
1551 [[ ! -e ${USEFILE} ]] && return 1 1576 [[ ! -e ${USEFILE} ]] && return 0
1552 1577
1553 local USE_BUILT=$(<${USEFILE}) 1578 local USE_BUILT=$(<${USEFILE})
1554 while [[ $# -gt 0 ]] ; do 1579 while [[ $# -gt 0 ]] ; do
1555 if [[ ${opt} = "-o" ]] ; then 1580 if [[ ${opt} = "-o" ]] ; then
1556 has $1 ${USE_BUILT} && return 0 1581 has $1 ${USE_BUILT} && return 0
1613 # We don't want to quote ${bin} so that people can pass complex 1638 # We don't want to quote ${bin} so that people can pass complex
1614 # things as $bin ... "./someprog --args" 1639 # things as $bin ... "./someprog --args"
1615 cat << EOF > "${tmpwrapper}" 1640 cat << EOF > "${tmpwrapper}"
1616#!/bin/sh 1641#!/bin/sh
1617cd "${chdir:-.}" 1642cd "${chdir:-.}"
1643if [ -n "${libdir}" ] ; then
1618if [ "\${LD_LIBRARY_PATH+set}" = "set" ] && [ -n "${libdir}" ] ; then 1644 if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
1619 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}" 1645 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1646 else
1647 export LD_LIBRARY_PATH="${libdir}"
1648 fi
1620fi 1649fi
1621exec ${bin} "\$@" 1650exec ${bin} "\$@"
1622EOF 1651EOF
1623 chmod go+rx "${tmpwrapper}" 1652 chmod go+rx "${tmpwrapper}"
1624 if [[ -n ${path} ]] ; then 1653 if [[ -n ${path} ]] ; then

Legend:
Removed from v.1.206  
changed lines
  Added in v.1.240

  ViewVC Help
Powered by ViewVC 1.1.20