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

Diff of /eclass/eutils.eclass

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

Revision 1.208 Revision 1.247
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.208 2005/10/19 03:36:15 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.247 2006/08/11 02:21:47 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
21# outputting to a terminal, don't wait. For compatability purposes, the argument 18# outputting to a terminal, don't wait. For compatability purposes, the argument
22# must be an integer greater than zero. 19# must be an integer greater than zero.
23# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004) 20# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004)
24epause() { 21epause() {
25 if [ -z "$EPAUSE_IGNORE" ] && [ -t 1 ] ; then 22 [[ -z ${EPAUSE_IGNORE} ]] && sleep ${1:-5}
26 sleep ${1:-5}
27 fi
28} 23}
29 24
30# Beep the specified number of times (defaults to five). If our output 25# Beep the specified number of times (defaults to five). If our output
31# is not a terminal, don't beep. If the EBEEP_IGNORE env var is set, 26# is not a terminal, don't beep. If the EBEEP_IGNORE env var is set,
32# don't beep. 27# don't beep.
33# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004) 28# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004)
34ebeep() { 29ebeep() {
35 local n 30 local n
36 if [ -z "$EBEEP_IGNORE" ] && [ -t 1 ] ; then 31 if [[ -z ${EBEEP_IGNORE} ]] ; then
37 for ((n=1 ; n <= ${1:-5} ; n++)) ; do 32 for ((n=1 ; n <= ${1:-5} ; n++)) ; do
38 echo -ne "\a" 33 echo -ne "\a"
39 sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null 34 sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
40 echo -ne "\a" 35 echo -ne "\a"
41 sleep 1 36 sleep 1
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 }
171 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; } 141 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; }
172 local PIPE_CMD="" 142 local PIPE_CMD=""
173 local STDERR_TARGET="${T}/$$.out" 143 local STDERR_TARGET="${T}/$$.out"
174 local PATCH_TARGET="${T}/$$.patch" 144 local PATCH_TARGET="${T}/$$.patch"
175 local PATCH_SUFFIX="" 145 local PATCH_SUFFIX=""
285 255
286 # Allow for prefix to differ ... im lazy, so shoot me :/ 256 # Allow for prefix to differ ... im lazy, so shoot me :/
287 while [ "${count}" -lt 5 ] 257 while [ "${count}" -lt 5 ]
288 do 258 do
289 # Generate some useful debug info ... 259 # Generate some useful debug info ...
290 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 260 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
291 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 261 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
292 262
293 if [ "${PATCH_SUFFIX}" != "patch" ] 263 if [ "${PATCH_SUFFIX}" != "patch" ]
294 then 264 then
295 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 265 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
300 270
301 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 271 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
302 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##*/}
303 273
304 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 274 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
305 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 275 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
306 276
307 if [ "${PATCH_SUFFIX}" != "patch" ] 277 if [ "${PATCH_SUFFIX}" != "patch" ]
308 then 278 then
309 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
310 then 280 then
316 fi 286 fi
317 fi 287 fi
318 288
319 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f ; _epatch_assert) >> ${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
320 then 290 then
321 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 291 _epatch_draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
322 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 292 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
323 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 293 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
324 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 294 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
325 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 295 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
326 296
327 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
328 _epatch_assert 298 _epatch_assert
329 299
330 if [ "$?" -ne 0 ] 300 if [ "$?" -ne 0 ]
396 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM} 366 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
397 done 367 done
398 ${exe} "${tmp}" || ${exe} -p "${tmp}" 368 ${exe} "${tmp}" || ${exe} -p "${tmp}"
399 echo "${tmp}" 369 echo "${tmp}"
400 else 370 else
401 [[ ${exe} == "touch" ]] \ 371 if [[ ${exe} == "touch" ]] ; then
402 && exe="-p" \ 372 [[ ${USERLAND} == "GNU" ]] \
403 || exe="-d" 373 && mktemp -p "${topdir}" \
404 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
405 fi 380 fi
406} 381}
407 382
408# Small wrapper for getent (Linux), nidump (Mac OS X), 383# Small wrapper for getent (Linux), nidump (Mac OS X),
409# and pw (FreeBSD) used in enewuser()/enewgroup() 384# and pw (FreeBSD) used in enewuser()/enewgroup()
421 *) # Numeric 396 *) # Numeric
422 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 397 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
423 ;; 398 ;;
424 esac 399 esac
425 ;; 400 ;;
426 *-freebsd*) 401 *-freebsd*|*-dragonfly*)
427 local opts action="user" 402 local opts action="user"
428 [[ $1 == "passwd" ]] || action="group" 403 [[ $1 == "passwd" ]] || action="group"
429 404
430 # lookup by uid/gid 405 # lookup by uid/gid
431 if [[ $2 == [[:digit:]]* ]] ; then 406 if [[ $2 == [[:digit:]]* ]] ; then
432 [[ ${action} == "user" ]] && opts="-u" || opts="-g" 407 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
433 fi 408 fi
434 409
435 pw show ${action} ${opts} "$2" -q 410 pw show ${action} ${opts} "$2" -q
436 ;; 411 ;;
437 *-netbsd*) 412 *-netbsd*|*-openbsd*)
438 grep "$2:\*:" /etc/$1 413 grep "$2:\*:" /etc/$1
439 ;; 414 ;;
440 *) 415 *)
441 type -p nscd >& /dev/null && nscd -i "$1" 416 type -p nscd >& /dev/null && nscd -i "$1"
442 getent "$1" "$2" 417 getent "$1" "$2"
456# shell: /bin/false 431# shell: /bin/false
457# homedir: /dev/null 432# homedir: /dev/null
458# groups: none 433# groups: none
459# extra: comment of 'added by portage for ${PN}' 434# extra: comment of 'added by portage for ${PN}'
460enewuser() { 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
461 # get the username 443 # get the username
462 local euser=$1; shift 444 local euser=$1; shift
463 if [[ -z ${euser} ]] ; then 445 if [[ -z ${euser} ]] ; then
464 eerror "No username specified !" 446 eerror "No username specified !"
465 die "Cannot call enewuser without a username" 447 die "Cannot call enewuser without a username"
497 einfo " - Userid: ${euid}" 479 einfo " - Userid: ${euid}"
498 480
499 # handle shell 481 # handle shell
500 local eshell=$1; shift 482 local eshell=$1; shift
501 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then 483 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
502 if [[ ! -e ${eshell} ]] ; then 484 if [[ ! -e ${ROOT}${eshell} ]] ; then
503 eerror "A shell was specified but it does not exist !" 485 eerror "A shell was specified but it does not exist !"
504 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"
505 fi 491 fi
506 else 492 else
507 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
508 [[ -x ${ROOT}${shell} ]] && break 494 [[ -x ${ROOT}${shell} ]] && break
509 done 495 done
580 einfo "Please report the ebuild along with the info below" 566 einfo "Please report the ebuild along with the info below"
581 einfo "eextra: $@" 567 einfo "eextra: $@"
582 die "Required function missing" 568 die "Required function missing"
583 fi 569 fi
584 ;; 570 ;;
585 *-freebsd*) 571 *-freebsd*|*-dragonfly*)
586 if [[ -z $@ ]] ; then 572 if [[ -z $@ ]] ; then
587 pw useradd ${euser} ${opts} \ 573 pw useradd ${euser} ${opts} \
588 -c "added by portage for ${PN}" \ 574 -c "added by portage for ${PN}" \
589 die "enewuser failed" 575 die "enewuser failed"
590 else 576 else
600 else 586 else
601 einfo " - Extra: $@" 587 einfo " - Extra: $@"
602 useradd ${opts} ${euser} "$@" || die "enewuser failed" 588 useradd ${opts} ${euser} "$@" || die "enewuser failed"
603 fi 589 fi
604 ;; 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
605 *) 605 *)
606 if [[ -z $@ ]] ; then 606 if [[ -z $@ ]] ; then
607 useradd ${opts} ${euser} \ 607 useradd ${opts} ${euser} \
608 -c "added by portage for ${PN}" \ 608 -c "added by portage for ${PN}" \
609 || die "enewuser failed" 609 || die "enewuser failed"
633# Default values if you do not specify any: 633# Default values if you do not specify any:
634# groupname: REQUIRED ! 634# groupname: REQUIRED !
635# gid: next available (see groupadd(8)) 635# gid: next available (see groupadd(8))
636# extra: none 636# extra: none
637enewgroup() { 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
638 # get the group 645 # get the group
639 local egroup="$1"; shift 646 local egroup="$1"; shift
640 if [ -z "${egroup}" ] 647 if [ -z "${egroup}" ]
641 then 648 then
642 eerror "No group specified !" 649 eerror "No group specified !"
704 esac 711 esac
705 dscl . create /groups/${egroup} gid ${egid} 712 dscl . create /groups/${egroup} gid ${egid}
706 dscl . create /groups/${egroup} passwd '*' 713 dscl . create /groups/${egroup} passwd '*'
707 ;; 714 ;;
708 715
709 *-freebsd*) 716 *-freebsd*|*-dragonfly*)
710 case ${egid} in 717 case ${egid} in
711 *[!0-9]*) # Non numeric 718 *[!0-9]*) # Non numeric
712 for egid in $(seq 101 999); do 719 for egid in $(seq 101 999); do
713 [ -z "`egetent group ${egid}`" ] && break 720 [ -z "`egetent group ${egid}`" ] && break
714 done 721 done
754 761
755# Make a desktop file ! 762# Make a desktop file !
756# Great for making those icons in kde/gnome startmenu ! 763# Great for making those icons in kde/gnome startmenu !
757# Amaze your friends ! Get the women ! Join today ! 764# Amaze your friends ! Get the women ! Join today !
758# 765#
759# make_desktop_entry(<binary>, [name], [icon], [type], [path]) 766# make_desktop_entry(<command>, [name], [icon], [type], [path])
760# 767#
761# binary: what binary does the app run with ? 768# binary: what command does the app run with ?
762# name: the name that will show up in the menu 769# name: the name that will show up in the menu
763# icon: give your little like a pretty little icon ... 770# icon: give your little like a pretty little icon ...
764# this can be relative (to /usr/share/pixmaps) or 771# this can be relative (to /usr/share/pixmaps) or
765# a full path to an icon 772# a full path to an icon
766# type: what kind of application is this ? for categories: 773# type: what kind of application is this ? for categories:
848 type="Network;${type}" 855 type="Network;${type}"
849 ;; 856 ;;
850 857
851 sci) 858 sci)
852 case ${catmin} in 859 case ${catmin} in
853 astro*) type=Astronomoy;; 860 astro*) type=Astronomy;;
854 bio*) type=Biology;; 861 bio*) type=Biology;;
855 calc*) type=Calculator;; 862 calc*) type=Calculator;;
856 chem*) type=Chemistry;; 863 chem*) type=Chemistry;;
857 geo*) type=Geology;; 864 geo*) type=Geology;;
858 math*) type=Math;; 865 math*) type=Math;;
878 local desktop_name="${PN}" 885 local desktop_name="${PN}"
879 else 886 else
880 local desktop_name="${PN}-${SLOT}" 887 local desktop_name="${PN}-${SLOT}"
881 fi 888 fi
882 local desktop=${T}/${exec%% *}-${desktop_name}.desktop 889 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
890# local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
883 891
884echo "[Desktop Entry] 892echo "[Desktop Entry]
885Encoding=UTF-8 893Encoding=UTF-8
886Version=0.9.2 894Version=0.9.2
887Name=${name} 895Name=${name}
888Type=Application 896Type=Application
889Comment=${DESCRIPTION} 897Comment=${DESCRIPTION}
890Exec=${exec} 898Exec=${exec}
899TryExec=${exec%% *}
891Path=${path} 900Path=${path}
892Icon=${icon} 901Icon=${icon}
893Categories=Application;${type};" > "${desktop}" 902Categories=Application;${type};" > "${desktop}"
894 903
895 ( 904 (
1010 local sizeoff_t=$2 1019 local sizeoff_t=$2
1011 1020
1012 [[ -z ${src} ]] && die "Could not locate source for '$1'" 1021 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1013 [[ -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 :("
1014 1023
1015 local shrtsrc="`basename ${src}`" 1024 local shrtsrc=$(basename "${src}")
1016 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1025 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1017 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1026 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
1018 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\"`
1019 1028
1020 # grab metadata for debug reasons 1029 # grab metadata for debug reasons
1084# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1093# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1085# - If the file is not specified then unpack will utilize ${A}. 1094# - If the file is not specified then unpack will utilize ${A}.
1086# - 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
1087# the proper offset from the script itself. 1096# the proper offset from the script itself.
1088unpack_makeself() { 1097unpack_makeself() {
1098 local src_input=${1:-${A}}
1089 local src=$(find_unpackable_file "$1") 1099 local src=$(find_unpackable_file "${src_input}")
1090 local skip=$2 1100 local skip=$2
1091 local exe=$3 1101 local exe=$3
1092 1102
1093 [[ -z ${src} ]] && die "Could not locate source for '$1'" 1103 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1094 1104
1095 local shrtsrc=$(basename "${src}") 1105 local shrtsrc=$(basename "${src}")
1096 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1106 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1097 if [ -z "${skip}" ] 1107 if [[ -z ${skip} ]] ; then
1098 then
1099 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1108 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1100 local skip=0 1109 local skip=0
1101 exe=tail 1110 exe=tail
1102 case ${ver} in 1111 case ${ver} in
1103 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
1104 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1113 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1105 ;; 1114 ;;
1106 2.0|2.0.1) 1115 2.0|2.0.1)
1107 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-) 1116 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-)
1108 ;; 1117 ;;
1116 ;; 1125 ;;
1117 2.1.3) 1126 2.1.3)
1118 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1127 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1119 let skip="skip + 1" 1128 let skip="skip + 1"
1120 ;; 1129 ;;
1121 2.1.4) 1130 2.1.4|2.1.5)
1122 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)
1123 skip=$(head -n ${skip} "${src}" | wc -c) 1132 skip=$(head -n ${skip} "${src}" | wc -c)
1124 exe="dd" 1133 exe="dd"
1125 ;; 1134 ;;
1126 *) 1135 *)
1231# and when the function returns, you can assume that the cd has been 1240# and when the function returns, you can assume that the cd has been
1232# found at CDROM_ROOT. 1241# found at CDROM_ROOT.
1233# 1242#
1234# normally the cdrom functions will refer to the cds as 'cd #1', 'cd #2', 1243# normally the cdrom functions will refer to the cds as 'cd #1', 'cd #2',
1235# etc... if you want to give the cds better names, then just export 1244# etc... if you want to give the cds better names, then just export
1236# the CDROM_NAME_X variables before calling cdrom_get_cds(). 1245# the appropriate CDROM_NAME variable before calling cdrom_get_cds().
1246# - CDROM_NAME="fooie cd" - for when you only want 1 cd
1247# - CDROM_NAME_1="install cd" - for when you want more than 1 cd
1248# CDROM_NAME_2="data cd"
1249# - CDROM_NAME_SET=( "install cd" "data cd" ) - short hand for CDROM_NAME_#
1237# 1250#
1238# for those multi cd ebuilds, see the cdrom_load_next_cd() below. 1251# for those multi cd ebuilds, see the cdrom_load_next_cd() below.
1239# 1252#
1240# Usage: cdrom_get_cds <file on cd1> [file on cd2] [file on cd3] [...] 1253# Usage: cdrom_get_cds <file on cd1> [file on cd2] [file on cd3] [...]
1241# - this will attempt to locate a cd based upon a file that is on 1254# - this will attempt to locate a cd based upon a file that is on
1245 # first we figure out how many cds we're dealing with by 1258 # first we figure out how many cds we're dealing with by
1246 # the # of files they gave us 1259 # the # of files they gave us
1247 local cdcnt=0 1260 local cdcnt=0
1248 local f= 1261 local f=
1249 for f in "$@" ; do 1262 for f in "$@" ; do
1250 cdcnt=$((cdcnt + 1)) 1263 ((++cdcnt))
1251 export CDROM_CHECK_${cdcnt}="$f" 1264 export CDROM_CHECK_${cdcnt}="$f"
1252 done 1265 done
1253 export CDROM_TOTAL_CDS=${cdcnt} 1266 export CDROM_TOTAL_CDS=${cdcnt}
1254 export CDROM_CURRENT_CD=1 1267 export CDROM_CURRENT_CD=1
1255 1268
1256 # now we see if the user gave use CD_ROOT ... 1269 # now we see if the user gave use CD_ROOT ...
1257 # if they did, let's just believe them that it's correct 1270 # if they did, let's just believe them that it's correct
1258 if [[ ! -z ${CD_ROOT} ]] ; then
1259 export CDROM_ROOT=${CD_ROOT}
1260 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1261 return
1262 fi
1263 # do the same for CD_ROOT_X
1264 if [[ ! -z ${CD_ROOT_1} ]] ; then 1271 if [[ -n ${CD_ROOT}${CD_ROOT_1} ]] ; then
1265 local var= 1272 local var=
1266 cdcnt=0 1273 cdcnt=0
1267 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1274 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1268 cdcnt=$((cdcnt + 1)) 1275 ((++cdcnt))
1269 var="CD_ROOT_${cdcnt}" 1276 var="CD_ROOT_${cdcnt}"
1277 [[ -z ${!var} ]] && var="CD_ROOT"
1270 if [[ -z ${!var} ]] ; then 1278 if [[ -z ${!var} ]] ; then
1271 eerror "You must either use just the CD_ROOT" 1279 eerror "You must either use just the CD_ROOT"
1272 eerror "or specify ALL the CD_ROOT_X variables." 1280 eerror "or specify ALL the CD_ROOT_X variables."
1273 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables." 1281 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."
1274 die "could not locate CD_ROOT_${cdcnt}" 1282 die "could not locate CD_ROOT_${cdcnt}"
1275 fi 1283 fi
1276 export CDROM_ROOTS_${cdcnt}="${!var}"
1277 done 1284 done
1278 export CDROM_ROOT=${CDROM_ROOTS_1} 1285 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1279 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1286 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1287 export CDROM_SET=-1
1288 for f in ${CDROM_CHECK_1//:/ } ; do
1289 ((++CDROM_SET))
1290 [[ -e ${CD_ROOT}/${f} ]] && break
1291 done
1292 export CDROM_MATCH=${f}
1280 return 1293 return
1281 fi 1294 fi
1282 1295
1296 # User didn't help us out so lets make sure they know they can
1297 # simplify the whole process ...
1283 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1298 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1284 einfon "This ebuild will need the " 1299 einfo "This ebuild will need the ${CDROM_NAME:-cdrom for ${PN}}"
1285 if [[ -z ${CDROM_NAME} ]] ; then
1286 echo "cdrom for ${PN}."
1287 else
1288 echo "${CDROM_NAME}."
1289 fi
1290 echo 1300 echo
1291 einfo "If you do not have the CD, but have the data files" 1301 einfo "If you do not have the CD, but have the data files"
1292 einfo "mounted somewhere on your filesystem, just export" 1302 einfo "mounted somewhere on your filesystem, just export"
1293 einfo "the variable CD_ROOT so that it points to the" 1303 einfo "the variable CD_ROOT so that it points to the"
1294 einfo "directory containing the files." 1304 einfo "directory containing the files."
1295 echo 1305 echo
1296 einfo "For example:" 1306 einfo "For example:"
1297 einfo "export CD_ROOT=/mnt/cdrom" 1307 einfo "export CD_ROOT=/mnt/cdrom"
1298 echo 1308 echo
1299 else 1309 else
1310 if [[ -n ${CDROM_NAME_SET} ]] ; then
1311 # Translate the CDROM_NAME_SET array into CDROM_NAME_#
1312 cdcnt=0
1313 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1314 ((++cdcnt))
1315 export CDROM_NAME_${cdcnt}="${CDROM_NAME_SET[$((${cdcnt}-1))]}"
1316 done
1317 fi
1318
1300 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1319 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
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 var="CDROM_NAME_${cdcnt}" 1323 var="CDROM_NAME_${cdcnt}"
1305 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}" 1324 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1306 done 1325 done
1307 echo 1326 echo
1308 einfo "If you do not have the CDs, but have the data files" 1327 einfo "If you do not have the CDs, but have the data files"
1309 einfo "mounted somewhere on your filesystem, just export" 1328 einfo "mounted somewhere on your filesystem, just export"
1310 einfo "the following variables so they point to the right place:" 1329 einfo "the following variables so they point to the right place:"
1311 einfon "" 1330 einfon ""
1312 cdcnt=0 1331 cdcnt=0
1313 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1332 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1314 cdcnt=$((cdcnt + 1)) 1333 ((++cdcnt))
1315 echo -n " CD_ROOT_${cdcnt}" 1334 echo -n " CD_ROOT_${cdcnt}"
1316 done 1335 done
1317 echo 1336 echo
1318 einfo "Or, if you have all the files in the same place, or" 1337 einfo "Or, if you have all the files in the same place, or"
1319 einfo "you only have one cdrom, you can export CD_ROOT" 1338 einfo "you only have one cdrom, you can export CD_ROOT"
1322 echo 1341 echo
1323 einfo "For example:" 1342 einfo "For example:"
1324 einfo "export CD_ROOT_1=/mnt/cdrom" 1343 einfo "export CD_ROOT_1=/mnt/cdrom"
1325 echo 1344 echo
1326 fi 1345 fi
1346
1347 export CDROM_SET=""
1327 export CDROM_CURRENT_CD=0 1348 export CDROM_CURRENT_CD=0
1328 cdrom_load_next_cd 1349 cdrom_load_next_cd
1329} 1350}
1330 1351
1331# this is only used when you need access to more than one cd. 1352# this is only used when you need access to more than one cd.
1332# when you have finished using the first cd, just call this function. 1353# when you have finished using the first cd, just call this function.
1333# when it returns, CDROM_ROOT will be pointing to the second cd. 1354# when it returns, CDROM_ROOT will be pointing to the second cd.
1334# remember, you can only go forward in the cd chain, you can't go back. 1355# remember, you can only go forward in the cd chain, you can't go back.
1335cdrom_load_next_cd() { 1356cdrom_load_next_cd() {
1336 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1337 local var= 1357 local var
1338 1358 ((++CDROM_CURRENT_CD))
1339 if [[ ! -z ${CD_ROOT} ]] ; then
1340 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1341 return
1342 fi
1343 1359
1344 unset CDROM_ROOT 1360 unset CDROM_ROOT
1345 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1361 var=CD_ROOT_${CDROM_CURRENT_CD}
1362 [[ -z ${!var} ]] && var="CD_ROOT"
1346 if [[ -z ${!var} ]] ; then 1363 if [[ -z ${!var} ]] ; then
1347 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1364 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1348 cdrom_locate_file_on_cd ${!var} 1365 _cdrom_locate_file_on_cd ${!var}
1349 else 1366 else
1350 export CDROM_ROOT=${!var} 1367 export CDROM_ROOT=${!var}
1351 fi 1368 fi
1352 1369
1353 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1370 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1358# all it does is try to locate a give file on a cd ... if the cd isn't 1375# all it does is try to locate a give file on a cd ... if the cd isn't
1359# found, then a message asking for the user to insert the cdrom will be 1376# found, then a message asking for the user to insert the cdrom will be
1360# displayed and we'll hang out here until: 1377# displayed and we'll hang out here until:
1361# (1) the file is found on a mounted cdrom 1378# (1) the file is found on a mounted cdrom
1362# (2) the user hits CTRL+C 1379# (2) the user hits CTRL+C
1363cdrom_locate_file_on_cd() { 1380_cdrom_locate_file_on_cd() {
1381 local mline=""
1382 local showedmsg=0
1383
1364 while [[ -z ${CDROM_ROOT} ]] ; do 1384 while [[ -z ${CDROM_ROOT} ]] ; do
1365 local dir=$(dirname "$*") 1385 local i=0
1386 local -a cdset=(${*//:/ })
1387 if [[ -n ${CDROM_SET} ]] ; then
1388 cdset=(${cdset[${CDROM_SET}]})
1389 fi
1390
1391 while [[ -n ${cdset[${i}]} ]] ; do
1392 local dir=$(dirname ${cdset[${i}]})
1366 local file=$(basename "$*") 1393 local file=$(basename ${cdset[${i}]})
1367 local mline=""
1368 local showedmsg=0
1369 1394
1370 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1395 for mline in $(mount | gawk '/(iso|cdrom|fs=cdfss)/ {print $3}') ; do
1371 [[ -d ${mline}/${dir} ]] || continue 1396 [[ -d ${mline}/${dir} ]] || continue
1372 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \ 1397 if [[ -n $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] ; then
1373 && export CDROM_ROOT=${mline} 1398 export CDROM_ROOT=${mline}
1399 export CDROM_SET=${i}
1400 export CDROM_MATCH=${cdset[${i}]}
1401 return
1402 fi
1403 done
1404
1405 ((++i))
1374 done 1406 done
1375 1407
1376 if [[ -z ${CDROM_ROOT} ]] ; then
1377 echo 1408 echo
1378 if [[ ${showedmsg} -eq 0 ]] ; then 1409 if [[ ${showedmsg} -eq 0 ]] ; then
1379 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1410 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1380 if [[ -z ${CDROM_NAME} ]] ; then 1411 if [[ -z ${CDROM_NAME} ]] ; then
1381 einfo "Please insert the cdrom for ${PN} now !" 1412 einfo "Please insert+mount the cdrom for ${PN} now !"
1382 else
1383 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1384 fi
1385 else 1413 else
1386 if [[ -z ${CDROM_NAME_1} ]] ; then
1387 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1388 else
1389 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1390 einfo "Please insert+mount the ${!var} cdrom now !" 1414 einfo "Please insert+mount the ${CDROM_NAME} cdrom now !"
1391 fi
1392 fi 1415 fi
1393 showedmsg=1 1416 else
1417 if [[ -z ${CDROM_NAME_1} ]] ; then
1418 einfo "Please insert+mount cd #${CDROM_CURRENT_CD} for ${PN} now !"
1419 else
1420 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1421 einfo "Please insert+mount the ${!var} cdrom now !"
1422 fi
1394 fi 1423 fi
1424 showedmsg=1
1425 fi
1395 einfo "Press return to scan for the cd again" 1426 einfo "Press return to scan for the cd again"
1396 einfo "or hit CTRL+C to abort the emerge." 1427 einfo "or hit CTRL+C to abort the emerge."
1397 echo 1428 echo
1398 einfo "If you are having trouble with the detection" 1429 einfo "If you are having trouble with the detection"
1399 einfo "of your CD, it is possible that you do not have" 1430 einfo "of your CD, it is possible that you do not have"
1400 einfo "Joliet support enabled in your kernel. Please" 1431 einfo "Joliet support enabled in your kernel. Please"
1401 einfo "check that CONFIG_JOLIET is enabled in your kernel." 1432 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1402 read 1433 read || die "something is screwed with your system"
1403 fi
1404 done 1434 done
1405} 1435}
1406 1436
1407# Make sure that LINGUAS only contains languages that 1437# Make sure that LINGUAS only contains languages that
1408# a package can support 1438# a package can support
1415# The -i builds a list of po files found in all the 1445# The -i builds a list of po files found in all the
1416# directories and uses the intersection of the lists. 1446# directories and uses the intersection of the lists.
1417# The -u builds a list of po files found in all the 1447# The -u builds a list of po files found in all the
1418# directories and uses the union of the lists. 1448# directories and uses the union of the lists.
1419strip-linguas() { 1449strip-linguas() {
1420 local ls newls 1450 local ls newls nols
1421 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then 1451 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1422 local op=$1; shift 1452 local op=$1; shift
1423 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1453 ls=$(find "$1" -name '*.po' -exec basename {} .po \;); shift
1424 local d f 1454 local d f
1425 for d in "$@" ; do 1455 for d in "$@" ; do
1426 if [[ ${op} == "-u" ]] ; then 1456 if [[ ${op} == "-u" ]] ; then
1427 newls=${ls} 1457 newls=${ls}
1428 else 1458 else
1429 newls="" 1459 newls=""
1430 fi 1460 fi
1431 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1461 for f in $(find "$d" -name '*.po' -exec basename {} .po \;) ; do
1432 if [[ ${op} == "-i" ]] ; then 1462 if [[ ${op} == "-i" ]] ; then
1433 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}" 1463 hasq ${f} ${ls} && newls="${newls} ${f}"
1434 else 1464 else
1435 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}" 1465 hasq ${f} ${ls} || newls="${newls} ${f}"
1436 fi 1466 fi
1437 done 1467 done
1438 ls=${newls} 1468 ls=${newls}
1439 done 1469 done
1440 ls=${ls//.po}
1441 else 1470 else
1442 ls=$@ 1471 ls="$@"
1443 fi 1472 fi
1444 1473
1445 ls=" ${ls} " 1474 nols=""
1446 newls="" 1475 newls=""
1447 for f in ${LINGUAS} ; do 1476 for f in ${LINGUAS} ; do
1448 if [[ ${ls/ ${f} /} != ${ls} ]] ; then 1477 if hasq ${f} ${ls} ; then
1449 newls="${newls} ${f}" 1478 newls="${newls} ${f}"
1450 else 1479 else
1451 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1480 nols="${nols} ${f}"
1452 fi 1481 fi
1453 done 1482 done
1454 if [[ -z ${newls} ]] ; then 1483 [[ -n ${nols} ]] \
1455 export LINGUAS="" 1484 && ewarn "Sorry, but ${PN} does not support the LINGUAs:" ${nols}
1456 else
1457 export LINGUAS=${newls:1} 1485 export LINGUAS=${newls:1}
1458 fi
1459} 1486}
1460 1487
1461# moved from kernel.eclass since they are generally useful outside of 1488# moved from kernel.eclass since they are generally useful outside of
1462# kernel.eclass -iggy (20041002) 1489# kernel.eclass -iggy (20041002)
1463 1490
1492 1519
1493# Jeremy Huddleston <eradicator@gentoo.org>: 1520# Jeremy Huddleston <eradicator@gentoo.org>:
1494# preserve_old_lib /path/to/libblah.so.0 1521# preserve_old_lib /path/to/libblah.so.0
1495# preserve_old_lib_notify /path/to/libblah.so.0 1522# preserve_old_lib_notify /path/to/libblah.so.0
1496# 1523#
1497# These functions are useful when a lib in your package changes --soname. Such 1524# These functions are useful when a lib in your package changes --library. Such
1498# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0 1525# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0
1499# would break packages that link against it. Most people get around this 1526# would break packages that link against it. Most people get around this
1500# by using the portage SLOT mechanism, but that is not always a relevant 1527# by using the portage SLOT mechanism, but that is not always a relevant
1501# solution, so instead you can add the following to your ebuilds: 1528# solution, so instead you can add the following to your ebuilds:
1502# 1529#
1533 1560
1534 ewarn "An old version of an installed library was detected on your system." 1561 ewarn "An old version of an installed library was detected on your system."
1535 ewarn "In order to avoid breaking packages that link against it, this older version" 1562 ewarn "In order to avoid breaking packages that link against it, this older version"
1536 ewarn "is not being removed. In order to make full use of this newer version," 1563 ewarn "is not being removed. In order to make full use of this newer version,"
1537 ewarn "you will need to execute the following command:" 1564 ewarn "you will need to execute the following command:"
1538 ewarn " revdep-rebuild --soname ${SONAME}" 1565 ewarn " revdep-rebuild --library ${SONAME}"
1539 ewarn 1566 ewarn
1540 ewarn "After doing that, you can safely remove ${LIB}" 1567 ewarn "After doing that, you can safely remove ${LIB}"
1541 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild" 1568 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1542 fi 1569 fi
1543} 1570}
1554built_with_use() { 1581built_with_use() {
1555 local opt=$1 1582 local opt=$1
1556 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1583 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1557 1584
1558 local PKG=$(best_version $1) 1585 local PKG=$(best_version $1)
1586 [[ -z ${PKG} ]] && die "Unable to resolve $1 to an installed package"
1559 shift 1587 shift
1560 1588
1561 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE" 1589 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
1562 [[ ! -e ${USEFILE} ]] && return 1 1590
1591 # if the USE file doesnt exist, assume the $PKG is either
1592 # injected or package.provided
1593 [[ ! -e ${USEFILE} ]] && die "Unable to determine what USE flags $PKG was built with"
1563 1594
1564 local USE_BUILT=$(<${USEFILE}) 1595 local USE_BUILT=$(<${USEFILE})
1565 while [[ $# -gt 0 ]] ; do 1596 while [[ $# -gt 0 ]] ; do
1566 if [[ ${opt} = "-o" ]] ; then 1597 if [[ ${opt} = "-o" ]] ; then
1567 has $1 ${USE_BUILT} && return 0 1598 has $1 ${USE_BUILT} && return 0
1624 # We don't want to quote ${bin} so that people can pass complex 1655 # We don't want to quote ${bin} so that people can pass complex
1625 # things as $bin ... "./someprog --args" 1656 # things as $bin ... "./someprog --args"
1626 cat << EOF > "${tmpwrapper}" 1657 cat << EOF > "${tmpwrapper}"
1627#!/bin/sh 1658#!/bin/sh
1628cd "${chdir:-.}" 1659cd "${chdir:-.}"
1660if [ -n "${libdir}" ] ; then
1629if [ "\${LD_LIBRARY_PATH+set}" = "set" ] && [ -n "${libdir}" ] ; then 1661 if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
1630 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}" 1662 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1663 else
1664 export LD_LIBRARY_PATH="${libdir}"
1665 fi
1631fi 1666fi
1632exec ${bin} "\$@" 1667exec ${bin} "\$@"
1633EOF 1668EOF
1634 chmod go+rx "${tmpwrapper}" 1669 chmod go+rx "${tmpwrapper}"
1635 if [[ -n ${path} ]] ; then 1670 if [[ -n ${path} ]] ; then

Legend:
Removed from v.1.208  
changed lines
  Added in v.1.247

  ViewVC Help
Powered by ViewVC 1.1.20