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

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

  ViewVC Help
Powered by ViewVC 1.1.20