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

Diff of /eclass/eutils.eclass

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

Revision 1.207 Revision 1.248
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.207 2005/10/12 13:52:01 flameeyes Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.248 2006/08/19 13:52:02 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() {
60 if [[ $(type -t _tc_gen_usr_ldscript) == "function" ]] ; then
61 _tc_gen_usr_ldscript "$@"
62 return $?
63 fi
64
65 ewarn "QA Notice: Please upgrade your ebuild to use toolchain-funcs"
66 ewarn "QA Notice: rather than gen_usr_ldscript() from eutils"
67
65 local libdir="$(get_libdir)" 68 local lib libdir=$(get_libdir)
66 # Just make sure it exists 69 # Just make sure it exists
67 dodir /usr/${libdir} 70 dodir /usr/${libdir}
68 71
69 for lib in "${@}" ; do 72 for lib in "${@}" ; do
70 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT 73 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT
76 79
77 See bug http://bugs.gentoo.org/4411 for more info. 80 See bug http://bugs.gentoo.org/4411 for more info.
78 */ 81 */
79 GROUP ( /${libdir}/${lib} ) 82 GROUP ( /${libdir}/${lib} )
80 END_LDSCRIPT 83 END_LDSCRIPT
81 fperms a+x "/usr/${libdir}/${lib}" 84 fperms a+x "/usr/${libdir}/${lib}" || die "could not change perms on ${lib}"
82 done 85 done
83} 86}
84 87
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 88
116# Default directory where patches are located 89# Default directory where patches are located
117EPATCH_SOURCE="${WORKDIR}/patch" 90EPATCH_SOURCE="${WORKDIR}/patch"
118# Default extension for patches 91# Default extension for patches
119EPATCH_SUFFIX="patch.bz2" 92EPATCH_SUFFIX="patch.bz2"
120# Default options for patch 93# Default options for patch
121# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571 94# 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. 95# Set --no-backup-if-mismatch so we don't leave '.orig' files behind.
96# Set -E to automatically remove empty files.
123EPATCH_OPTS="-g0 --no-backup-if-mismatch" 97EPATCH_OPTS="-g0 -E --no-backup-if-mismatch"
124# List of patches not to apply. Not this is only file names, 98# List of patches not to apply. Not this is only file names,
125# and not the full path .. 99# and not the full path ..
126EPATCH_EXCLUDE="" 100EPATCH_EXCLUDE=""
127# Change the printed message for a single patch. 101# Change the printed message for a single patch.
128EPATCH_SINGLE_MSG="" 102EPATCH_SINGLE_MSG=""
166# hand its a directory, it will set EPATCH_SOURCE to this. 140# hand its a directory, it will set EPATCH_SOURCE to this.
167# 141#
168# <azarah@gentoo.org> (10 Nov 2002) 142# <azarah@gentoo.org> (10 Nov 2002)
169# 143#
170epatch() { 144epatch() {
145 _epatch_draw_line() {
146 [[ -z $1 ]] && set "$(printf "%65s" '')"
147 echo "${1//?/=}"
148 }
149 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; }
171 local PIPE_CMD="" 150 local PIPE_CMD=""
172 local STDERR_TARGET="${T}/$$.out" 151 local STDERR_TARGET="${T}/$$.out"
173 local PATCH_TARGET="${T}/$$.patch" 152 local PATCH_TARGET="${T}/$$.patch"
174 local PATCH_SUFFIX="" 153 local PATCH_SUFFIX=""
175 local SINGLE_PATCH="no" 154 local SINGLE_PATCH="no"
284 263
285 # Allow for prefix to differ ... im lazy, so shoot me :/ 264 # Allow for prefix to differ ... im lazy, so shoot me :/
286 while [ "${count}" -lt 5 ] 265 while [ "${count}" -lt 5 ]
287 do 266 do
288 # Generate some useful debug info ... 267 # Generate some useful debug info ...
289 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 268 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
290 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 269 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
291 270
292 if [ "${PATCH_SUFFIX}" != "patch" ] 271 if [ "${PATCH_SUFFIX}" != "patch" ]
293 then 272 then
294 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 273 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
299 278
300 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 279 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
301 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 280 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
302 281
303 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 282 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
304 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 283 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
305 284
306 if [ "${PATCH_SUFFIX}" != "patch" ] 285 if [ "${PATCH_SUFFIX}" != "patch" ]
307 then 286 then
308 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1 287 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
309 then 288 then
313 count=5 292 count=5
314 break 293 break
315 fi 294 fi
316 fi 295 fi
317 296
318 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1 297 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f ; _epatch_assert) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
319 then 298 then
320 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 299 _epatch_draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
321 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 300 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
322 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 301 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
323 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 302 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
324 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 303 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
325 304
326 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1 305 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
306 _epatch_assert
327 307
328 if [ "$?" -ne 0 ] 308 if [ "$?" -ne 0 ]
329 then 309 then
330 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 310 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
331 echo 311 echo
394 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM} 374 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
395 done 375 done
396 ${exe} "${tmp}" || ${exe} -p "${tmp}" 376 ${exe} "${tmp}" || ${exe} -p "${tmp}"
397 echo "${tmp}" 377 echo "${tmp}"
398 else 378 else
399 [[ ${exe} == "touch" ]] \ 379 if [[ ${exe} == "touch" ]] ; then
400 && exe="-p" \ 380 [[ ${USERLAND} == "GNU" ]] \
401 || exe="-d" 381 && mktemp -p "${topdir}" \
402 mktemp ${exe} "${topdir}" 382 || TMPDIR="${topdir}" mktemp -t tmp
383 else
384 [[ ${USERLAND} == "GNU" ]] \
385 && mktemp -d "${topdir}" \
386 || TMPDIR="${topdir}" mktemp -dt tmp
387 fi
403 fi 388 fi
404} 389}
405 390
406# Small wrapper for getent (Linux), nidump (Mac OS X), 391# Small wrapper for getent (Linux), nidump (Mac OS X),
407# and pw (FreeBSD) used in enewuser()/enewgroup() 392# and pw (FreeBSD) used in enewuser()/enewgroup()
419 *) # Numeric 404 *) # Numeric
420 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 405 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
421 ;; 406 ;;
422 esac 407 esac
423 ;; 408 ;;
424 *-freebsd*) 409 *-freebsd*|*-dragonfly*)
425 local opts action="user" 410 local opts action="user"
426 [[ $1 == "passwd" ]] || action="group" 411 [[ $1 == "passwd" ]] || action="group"
427 412
428 # lookup by uid/gid 413 # lookup by uid/gid
429 if [[ $2 == [[:digit:]]* ]] ; then 414 if [[ $2 == [[:digit:]]* ]] ; then
430 [[ ${action} == "user" ]] && opts="-u" || opts="-g" 415 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
431 fi 416 fi
432 417
433 pw show ${action} ${opts} "$2" -q 418 pw show ${action} ${opts} "$2" -q
434 ;; 419 ;;
435 *-netbsd*) 420 *-netbsd*|*-openbsd*)
436 grep "$2:\*:" /etc/$1 421 grep "$2:\*:" /etc/$1
437 ;; 422 ;;
438 *) 423 *)
439 type -p nscd >& /dev/null && nscd -i "$1" 424 type -p nscd >& /dev/null && nscd -i "$1"
440 getent "$1" "$2" 425 getent "$1" "$2"
454# shell: /bin/false 439# shell: /bin/false
455# homedir: /dev/null 440# homedir: /dev/null
456# groups: none 441# groups: none
457# extra: comment of 'added by portage for ${PN}' 442# extra: comment of 'added by portage for ${PN}'
458enewuser() { 443enewuser() {
444 case ${EBUILD_PHASE} in
445 unpack|compile|test|install)
446 eerror "'enewuser()' called from '${EBUILD_PHASE}()' which is not a pkg_* function."
447 eerror "Package fails at QA and at life. Please file a bug."
448 die "Bad package! enewuser is only for use in pkg_* functions!"
449 esac
450
459 # get the username 451 # get the username
460 local euser=$1; shift 452 local euser=$1; shift
461 if [[ -z ${euser} ]] ; then 453 if [[ -z ${euser} ]] ; then
462 eerror "No username specified !" 454 eerror "No username specified !"
463 die "Cannot call enewuser without a username" 455 die "Cannot call enewuser without a username"
495 einfo " - Userid: ${euid}" 487 einfo " - Userid: ${euid}"
496 488
497 # handle shell 489 # handle shell
498 local eshell=$1; shift 490 local eshell=$1; shift
499 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then 491 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
500 if [[ ! -e ${eshell} ]] ; then 492 if [[ ! -e ${ROOT}${eshell} ]] ; then
501 eerror "A shell was specified but it does not exist !" 493 eerror "A shell was specified but it does not exist !"
502 die "${eshell} does not exist" 494 die "${eshell} does not exist in ${ROOT}"
495 fi
496 if [[ ${eshell} == */false || ${eshell} == */nologin ]] ; then
497 eerror "Do not specify ${eshell} yourself, use -1"
498 die "Pass '-1' as the shell parameter"
503 fi 499 fi
504 else 500 else
505 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do 501 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
506 [[ -x ${ROOT}${shell} ]] && break 502 [[ -x ${ROOT}${shell} ]] && break
507 done 503 done
578 einfo "Please report the ebuild along with the info below" 574 einfo "Please report the ebuild along with the info below"
579 einfo "eextra: $@" 575 einfo "eextra: $@"
580 die "Required function missing" 576 die "Required function missing"
581 fi 577 fi
582 ;; 578 ;;
583 *-freebsd*) 579 *-freebsd*|*-dragonfly*)
584 if [[ -z $@ ]] ; then 580 if [[ -z $@ ]] ; then
585 pw useradd ${euser} ${opts} \ 581 pw useradd ${euser} ${opts} \
586 -c "added by portage for ${PN}" \ 582 -c "added by portage for ${PN}" \
587 die "enewuser failed" 583 die "enewuser failed"
588 else 584 else
598 else 594 else
599 einfo " - Extra: $@" 595 einfo " - Extra: $@"
600 useradd ${opts} ${euser} "$@" || die "enewuser failed" 596 useradd ${opts} ${euser} "$@" || die "enewuser failed"
601 fi 597 fi
602 ;; 598 ;;
599
600 *-openbsd*)
601 if [[ -z $@ ]] ; then
602 useradd -u ${euid} -s ${eshell} \
603 -d ${ehome} -c "Added by portage for ${PN}" \
604 -g ${egroups} ${euser} || die "enewuser failed"
605 else
606 einfo " - Extra: $@"
607 useradd -u ${euid} -s ${eshell} \
608 -d ${ehome} -c "Added by portage for ${PN}" \
609 -g ${egroups} ${euser} "$@" || die "enewuser failed"
610 fi
611 ;;
612
603 *) 613 *)
604 if [[ -z $@ ]] ; then 614 if [[ -z $@ ]] ; then
605 useradd ${opts} ${euser} \ 615 useradd ${opts} ${euser} \
606 -c "added by portage for ${PN}" \ 616 -c "added by portage for ${PN}" \
607 || die "enewuser failed" 617 || die "enewuser failed"
631# Default values if you do not specify any: 641# Default values if you do not specify any:
632# groupname: REQUIRED ! 642# groupname: REQUIRED !
633# gid: next available (see groupadd(8)) 643# gid: next available (see groupadd(8))
634# extra: none 644# extra: none
635enewgroup() { 645enewgroup() {
646 case ${EBUILD_PHASE} in
647 unpack|compile|test|install)
648 eerror "'enewgroup()' called from '${EBUILD_PHASE}()' which is not a pkg_* function."
649 eerror "Package fails at QA and at life. Please file a bug."
650 die "Bad package! enewgroup is only for use in pkg_* functions!"
651 esac
652
636 # get the group 653 # get the group
637 local egroup="$1"; shift 654 local egroup="$1"; shift
638 if [ -z "${egroup}" ] 655 if [ -z "${egroup}" ]
639 then 656 then
640 eerror "No group specified !" 657 eerror "No group specified !"
702 esac 719 esac
703 dscl . create /groups/${egroup} gid ${egid} 720 dscl . create /groups/${egroup} gid ${egid}
704 dscl . create /groups/${egroup} passwd '*' 721 dscl . create /groups/${egroup} passwd '*'
705 ;; 722 ;;
706 723
707 *-freebsd*) 724 *-freebsd*|*-dragonfly*)
708 case ${egid} in 725 case ${egid} in
709 *[!0-9]*) # Non numeric 726 *[!0-9]*) # Non numeric
710 for egid in $(seq 101 999); do 727 for egid in $(seq 101 999); do
711 [ -z "`egetent group ${egid}`" ] && break 728 [ -z "`egetent group ${egid}`" ] && break
712 done 729 done
752 769
753# Make a desktop file ! 770# Make a desktop file !
754# Great for making those icons in kde/gnome startmenu ! 771# Great for making those icons in kde/gnome startmenu !
755# Amaze your friends ! Get the women ! Join today ! 772# Amaze your friends ! Get the women ! Join today !
756# 773#
757# make_desktop_entry(<binary>, [name], [icon], [type], [path]) 774# make_desktop_entry(<command>, [name], [icon], [type], [path])
758# 775#
759# binary: what binary does the app run with ? 776# binary: what command does the app run with ?
760# name: the name that will show up in the menu 777# name: the name that will show up in the menu
761# icon: give your little like a pretty little icon ... 778# icon: give your little like a pretty little icon ...
762# this can be relative (to /usr/share/pixmaps) or 779# this can be relative (to /usr/share/pixmaps) or
763# a full path to an icon 780# a full path to an icon
764# type: what kind of application is this ? for categories: 781# type: what kind of application is this ? for categories:
846 type="Network;${type}" 863 type="Network;${type}"
847 ;; 864 ;;
848 865
849 sci) 866 sci)
850 case ${catmin} in 867 case ${catmin} in
851 astro*) type=Astronomoy;; 868 astro*) type=Astronomy;;
852 bio*) type=Biology;; 869 bio*) type=Biology;;
853 calc*) type=Calculator;; 870 calc*) type=Calculator;;
854 chem*) type=Chemistry;; 871 chem*) type=Chemistry;;
855 geo*) type=Geology;; 872 geo*) type=Geology;;
856 math*) type=Math;; 873 math*) type=Math;;
876 local desktop_name="${PN}" 893 local desktop_name="${PN}"
877 else 894 else
878 local desktop_name="${PN}-${SLOT}" 895 local desktop_name="${PN}-${SLOT}"
879 fi 896 fi
880 local desktop=${T}/${exec%% *}-${desktop_name}.desktop 897 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
898# local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
881 899
882echo "[Desktop Entry] 900echo "[Desktop Entry]
883Encoding=UTF-8 901Encoding=UTF-8
884Version=0.9.2 902Version=0.9.2
885Name=${name} 903Name=${name}
886Type=Application 904Type=Application
887Comment=${DESCRIPTION} 905Comment=${DESCRIPTION}
888Exec=${exec} 906Exec=${exec}
907TryExec=${exec%% *}
889Path=${path} 908Path=${path}
890Icon=${icon} 909Icon=${icon}
891Categories=Application;${type};" > "${desktop}" 910Categories=Application;${type};" > "${desktop}"
892 911
893 ( 912 (
1008 local sizeoff_t=$2 1027 local sizeoff_t=$2
1009 1028
1010 [[ -z ${src} ]] && die "Could not locate source for '$1'" 1029 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1011 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :(" 1030 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
1012 1031
1013 local shrtsrc="`basename ${src}`" 1032 local shrtsrc=$(basename "${src}")
1014 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1033 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1015 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1034 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
1016 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"` 1035 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
1017 1036
1018 # grab metadata for debug reasons 1037 # grab metadata for debug reasons
1082# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1101# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1083# - If the file is not specified then unpack will utilize ${A}. 1102# - If the file is not specified then unpack will utilize ${A}.
1084# - If the offset is not specified then we will attempt to extract 1103# - If the offset is not specified then we will attempt to extract
1085# the proper offset from the script itself. 1104# the proper offset from the script itself.
1086unpack_makeself() { 1105unpack_makeself() {
1106 local src_input=${1:-${A}}
1087 local src=$(find_unpackable_file "$1") 1107 local src=$(find_unpackable_file "${src_input}")
1088 local skip=$2 1108 local skip=$2
1089 local exe=$3 1109 local exe=$3
1090 1110
1091 [[ -z ${src} ]] && die "Could not locate source for '$1'" 1111 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1092 1112
1093 local shrtsrc=$(basename "${src}") 1113 local shrtsrc=$(basename "${src}")
1094 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1114 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1095 if [ -z "${skip}" ] 1115 if [[ -z ${skip} ]] ; then
1096 then
1097 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1116 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1098 local skip=0 1117 local skip=0
1099 exe=tail 1118 exe=tail
1100 case ${ver} in 1119 case ${ver} in
1101 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1120 1.5.*|1.6.0-nv) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
1102 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1121 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1103 ;; 1122 ;;
1104 2.0|2.0.1) 1123 2.0|2.0.1)
1105 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-) 1124 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-)
1106 ;; 1125 ;;
1114 ;; 1133 ;;
1115 2.1.3) 1134 2.1.3)
1116 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1135 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1117 let skip="skip + 1" 1136 let skip="skip + 1"
1118 ;; 1137 ;;
1119 2.1.4) 1138 2.1.4|2.1.5)
1120 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1) 1139 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
1121 skip=$(head -n ${skip} "${src}" | wc -c) 1140 skip=$(head -n ${skip} "${src}" | wc -c)
1122 exe="dd" 1141 exe="dd"
1123 ;; 1142 ;;
1124 *) 1143 *)
1229# and when the function returns, you can assume that the cd has been 1248# and when the function returns, you can assume that the cd has been
1230# found at CDROM_ROOT. 1249# found at CDROM_ROOT.
1231# 1250#
1232# normally the cdrom functions will refer to the cds as 'cd #1', 'cd #2', 1251# normally the cdrom functions will refer to the cds as 'cd #1', 'cd #2',
1233# etc... if you want to give the cds better names, then just export 1252# etc... if you want to give the cds better names, then just export
1234# the CDROM_NAME_X variables before calling cdrom_get_cds(). 1253# the appropriate CDROM_NAME variable before calling cdrom_get_cds().
1254# - CDROM_NAME="fooie cd" - for when you only want 1 cd
1255# - CDROM_NAME_1="install cd" - for when you want more than 1 cd
1256# CDROM_NAME_2="data cd"
1257# - CDROM_NAME_SET=( "install cd" "data cd" ) - short hand for CDROM_NAME_#
1235# 1258#
1236# for those multi cd ebuilds, see the cdrom_load_next_cd() below. 1259# for those multi cd ebuilds, see the cdrom_load_next_cd() below.
1237# 1260#
1238# Usage: cdrom_get_cds <file on cd1> [file on cd2] [file on cd3] [...] 1261# Usage: cdrom_get_cds <file on cd1> [file on cd2] [file on cd3] [...]
1239# - this will attempt to locate a cd based upon a file that is on 1262# - this will attempt to locate a cd based upon a file that is on
1243 # first we figure out how many cds we're dealing with by 1266 # first we figure out how many cds we're dealing with by
1244 # the # of files they gave us 1267 # the # of files they gave us
1245 local cdcnt=0 1268 local cdcnt=0
1246 local f= 1269 local f=
1247 for f in "$@" ; do 1270 for f in "$@" ; do
1248 cdcnt=$((cdcnt + 1)) 1271 ((++cdcnt))
1249 export CDROM_CHECK_${cdcnt}="$f" 1272 export CDROM_CHECK_${cdcnt}="$f"
1250 done 1273 done
1251 export CDROM_TOTAL_CDS=${cdcnt} 1274 export CDROM_TOTAL_CDS=${cdcnt}
1252 export CDROM_CURRENT_CD=1 1275 export CDROM_CURRENT_CD=1
1253 1276
1254 # now we see if the user gave use CD_ROOT ... 1277 # now we see if the user gave use CD_ROOT ...
1255 # if they did, let's just believe them that it's correct 1278 # if they did, let's just believe them that it's correct
1256 if [[ ! -z ${CD_ROOT} ]] ; then
1257 export CDROM_ROOT=${CD_ROOT}
1258 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1259 return
1260 fi
1261 # do the same for CD_ROOT_X
1262 if [[ ! -z ${CD_ROOT_1} ]] ; then 1279 if [[ -n ${CD_ROOT}${CD_ROOT_1} ]] ; then
1263 local var= 1280 local var=
1264 cdcnt=0 1281 cdcnt=0
1265 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1282 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1266 cdcnt=$((cdcnt + 1)) 1283 ((++cdcnt))
1267 var="CD_ROOT_${cdcnt}" 1284 var="CD_ROOT_${cdcnt}"
1285 [[ -z ${!var} ]] && var="CD_ROOT"
1268 if [[ -z ${!var} ]] ; then 1286 if [[ -z ${!var} ]] ; then
1269 eerror "You must either use just the CD_ROOT" 1287 eerror "You must either use just the CD_ROOT"
1270 eerror "or specify ALL the CD_ROOT_X variables." 1288 eerror "or specify ALL the CD_ROOT_X variables."
1271 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables." 1289 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."
1272 die "could not locate CD_ROOT_${cdcnt}" 1290 die "could not locate CD_ROOT_${cdcnt}"
1273 fi 1291 fi
1274 export CDROM_ROOTS_${cdcnt}="${!var}"
1275 done 1292 done
1276 export CDROM_ROOT=${CDROM_ROOTS_1} 1293 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1277 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1294 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1295 export CDROM_SET=-1
1296 for f in ${CDROM_CHECK_1//:/ } ; do
1297 ((++CDROM_SET))
1298 [[ -e ${CD_ROOT}/${f} ]] && break
1299 done
1300 export CDROM_MATCH=${f}
1278 return 1301 return
1279 fi 1302 fi
1280 1303
1304 # User didn't help us out so lets make sure they know they can
1305 # simplify the whole process ...
1281 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1306 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1282 einfon "This ebuild will need the " 1307 einfo "This ebuild will need the ${CDROM_NAME:-cdrom for ${PN}}"
1283 if [[ -z ${CDROM_NAME} ]] ; then
1284 echo "cdrom for ${PN}."
1285 else
1286 echo "${CDROM_NAME}."
1287 fi
1288 echo 1308 echo
1289 einfo "If you do not have the CD, but have the data files" 1309 einfo "If you do not have the CD, but have the data files"
1290 einfo "mounted somewhere on your filesystem, just export" 1310 einfo "mounted somewhere on your filesystem, just export"
1291 einfo "the variable CD_ROOT so that it points to the" 1311 einfo "the variable CD_ROOT so that it points to the"
1292 einfo "directory containing the files." 1312 einfo "directory containing the files."
1293 echo 1313 echo
1294 einfo "For example:" 1314 einfo "For example:"
1295 einfo "export CD_ROOT=/mnt/cdrom" 1315 einfo "export CD_ROOT=/mnt/cdrom"
1296 echo 1316 echo
1297 else 1317 else
1318 if [[ -n ${CDROM_NAME_SET} ]] ; then
1319 # Translate the CDROM_NAME_SET array into CDROM_NAME_#
1320 cdcnt=0
1321 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1322 ((++cdcnt))
1323 export CDROM_NAME_${cdcnt}="${CDROM_NAME_SET[$((${cdcnt}-1))]}"
1324 done
1325 fi
1326
1298 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1327 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1299 cdcnt=0 1328 cdcnt=0
1300 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1329 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1301 cdcnt=$((cdcnt + 1)) 1330 ((++cdcnt))
1302 var="CDROM_NAME_${cdcnt}" 1331 var="CDROM_NAME_${cdcnt}"
1303 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}" 1332 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1304 done 1333 done
1305 echo 1334 echo
1306 einfo "If you do not have the CDs, but have the data files" 1335 einfo "If you do not have the CDs, but have the data files"
1307 einfo "mounted somewhere on your filesystem, just export" 1336 einfo "mounted somewhere on your filesystem, just export"
1308 einfo "the following variables so they point to the right place:" 1337 einfo "the following variables so they point to the right place:"
1309 einfon "" 1338 einfon ""
1310 cdcnt=0 1339 cdcnt=0
1311 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1340 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1312 cdcnt=$((cdcnt + 1)) 1341 ((++cdcnt))
1313 echo -n " CD_ROOT_${cdcnt}" 1342 echo -n " CD_ROOT_${cdcnt}"
1314 done 1343 done
1315 echo 1344 echo
1316 einfo "Or, if you have all the files in the same place, or" 1345 einfo "Or, if you have all the files in the same place, or"
1317 einfo "you only have one cdrom, you can export CD_ROOT" 1346 einfo "you only have one cdrom, you can export CD_ROOT"
1320 echo 1349 echo
1321 einfo "For example:" 1350 einfo "For example:"
1322 einfo "export CD_ROOT_1=/mnt/cdrom" 1351 einfo "export CD_ROOT_1=/mnt/cdrom"
1323 echo 1352 echo
1324 fi 1353 fi
1354
1355 export CDROM_SET=""
1325 export CDROM_CURRENT_CD=0 1356 export CDROM_CURRENT_CD=0
1326 cdrom_load_next_cd 1357 cdrom_load_next_cd
1327} 1358}
1328 1359
1329# this is only used when you need access to more than one cd. 1360# this is only used when you need access to more than one cd.
1330# when you have finished using the first cd, just call this function. 1361# when you have finished using the first cd, just call this function.
1331# when it returns, CDROM_ROOT will be pointing to the second cd. 1362# when it returns, CDROM_ROOT will be pointing to the second cd.
1332# remember, you can only go forward in the cd chain, you can't go back. 1363# remember, you can only go forward in the cd chain, you can't go back.
1333cdrom_load_next_cd() { 1364cdrom_load_next_cd() {
1334 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1335 local var= 1365 local var
1336 1366 ((++CDROM_CURRENT_CD))
1337 if [[ ! -z ${CD_ROOT} ]] ; then
1338 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1339 return
1340 fi
1341 1367
1342 unset CDROM_ROOT 1368 unset CDROM_ROOT
1343 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1369 var=CD_ROOT_${CDROM_CURRENT_CD}
1370 [[ -z ${!var} ]] && var="CD_ROOT"
1344 if [[ -z ${!var} ]] ; then 1371 if [[ -z ${!var} ]] ; then
1345 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1372 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1346 cdrom_locate_file_on_cd ${!var} 1373 _cdrom_locate_file_on_cd ${!var}
1347 else 1374 else
1348 export CDROM_ROOT=${!var} 1375 export CDROM_ROOT=${!var}
1349 fi 1376 fi
1350 1377
1351 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1378 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1356# all it does is try to locate a give file on a cd ... if the cd isn't 1383# all it does is try to locate a give file on a cd ... if the cd isn't
1357# found, then a message asking for the user to insert the cdrom will be 1384# found, then a message asking for the user to insert the cdrom will be
1358# displayed and we'll hang out here until: 1385# displayed and we'll hang out here until:
1359# (1) the file is found on a mounted cdrom 1386# (1) the file is found on a mounted cdrom
1360# (2) the user hits CTRL+C 1387# (2) the user hits CTRL+C
1361cdrom_locate_file_on_cd() { 1388_cdrom_locate_file_on_cd() {
1389 local mline=""
1390 local showedmsg=0
1391
1362 while [[ -z ${CDROM_ROOT} ]] ; do 1392 while [[ -z ${CDROM_ROOT} ]] ; do
1363 local dir=$(dirname "$*") 1393 local i=0
1394 local -a cdset=(${*//:/ })
1395 if [[ -n ${CDROM_SET} ]] ; then
1396 cdset=(${cdset[${CDROM_SET}]})
1397 fi
1398
1399 while [[ -n ${cdset[${i}]} ]] ; do
1400 local dir=$(dirname ${cdset[${i}]})
1364 local file=$(basename "$*") 1401 local file=$(basename ${cdset[${i}]})
1365 local mline=""
1366 local showedmsg=0
1367 1402
1368 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1403 for mline in $(mount | gawk '/(iso|cdrom|fs=cdfss)/ {print $3}') ; do
1369 [[ -d ${mline}/${dir} ]] || continue 1404 [[ -d ${mline}/${dir} ]] || continue
1370 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \ 1405 if [[ -n $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] ; then
1371 && export CDROM_ROOT=${mline} 1406 export CDROM_ROOT=${mline}
1407 export CDROM_SET=${i}
1408 export CDROM_MATCH=${cdset[${i}]}
1409 return
1410 fi
1411 done
1412
1413 ((++i))
1372 done 1414 done
1373 1415
1374 if [[ -z ${CDROM_ROOT} ]] ; then
1375 echo 1416 echo
1376 if [[ ${showedmsg} -eq 0 ]] ; then 1417 if [[ ${showedmsg} -eq 0 ]] ; then
1377 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1418 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1378 if [[ -z ${CDROM_NAME} ]] ; then 1419 if [[ -z ${CDROM_NAME} ]] ; then
1379 einfo "Please insert the cdrom for ${PN} now !" 1420 einfo "Please insert+mount the cdrom for ${PN} now !"
1380 else
1381 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1382 fi
1383 else 1421 else
1384 if [[ -z ${CDROM_NAME_1} ]] ; then
1385 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1386 else
1387 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1388 einfo "Please insert+mount the ${!var} cdrom now !" 1422 einfo "Please insert+mount the ${CDROM_NAME} cdrom now !"
1389 fi
1390 fi 1423 fi
1391 showedmsg=1 1424 else
1425 if [[ -z ${CDROM_NAME_1} ]] ; then
1426 einfo "Please insert+mount cd #${CDROM_CURRENT_CD} for ${PN} now !"
1427 else
1428 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1429 einfo "Please insert+mount the ${!var} cdrom now !"
1430 fi
1392 fi 1431 fi
1432 showedmsg=1
1433 fi
1393 einfo "Press return to scan for the cd again" 1434 einfo "Press return to scan for the cd again"
1394 einfo "or hit CTRL+C to abort the emerge." 1435 einfo "or hit CTRL+C to abort the emerge."
1395 echo 1436 echo
1396 einfo "If you are having trouble with the detection" 1437 einfo "If you are having trouble with the detection"
1397 einfo "of your CD, it is possible that you do not have" 1438 einfo "of your CD, it is possible that you do not have"
1398 einfo "Joliet support enabled in your kernel. Please" 1439 einfo "Joliet support enabled in your kernel. Please"
1399 einfo "check that CONFIG_JOLIET is enabled in your kernel." 1440 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1400 read 1441 read || die "something is screwed with your system"
1401 fi
1402 done 1442 done
1403} 1443}
1404 1444
1405# Make sure that LINGUAS only contains languages that 1445# Make sure that LINGUAS only contains languages that
1406# a package can support 1446# a package can support
1413# The -i builds a list of po files found in all the 1453# The -i builds a list of po files found in all the
1414# directories and uses the intersection of the lists. 1454# directories and uses the intersection of the lists.
1415# The -u builds a list of po files found in all the 1455# The -u builds a list of po files found in all the
1416# directories and uses the union of the lists. 1456# directories and uses the union of the lists.
1417strip-linguas() { 1457strip-linguas() {
1418 local ls newls 1458 local ls newls nols
1419 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then 1459 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1420 local op=$1; shift 1460 local op=$1; shift
1421 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1461 ls=$(find "$1" -name '*.po' -exec basename {} .po \;); shift
1422 local d f 1462 local d f
1423 for d in "$@" ; do 1463 for d in "$@" ; do
1424 if [[ ${op} == "-u" ]] ; then 1464 if [[ ${op} == "-u" ]] ; then
1425 newls=${ls} 1465 newls=${ls}
1426 else 1466 else
1427 newls="" 1467 newls=""
1428 fi 1468 fi
1429 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1469 for f in $(find "$d" -name '*.po' -exec basename {} .po \;) ; do
1430 if [[ ${op} == "-i" ]] ; then 1470 if [[ ${op} == "-i" ]] ; then
1431 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}" 1471 hasq ${f} ${ls} && newls="${newls} ${f}"
1432 else 1472 else
1433 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}" 1473 hasq ${f} ${ls} || newls="${newls} ${f}"
1434 fi 1474 fi
1435 done 1475 done
1436 ls=${newls} 1476 ls=${newls}
1437 done 1477 done
1438 ls=${ls//.po}
1439 else 1478 else
1440 ls=$@ 1479 ls="$@"
1441 fi 1480 fi
1442 1481
1443 ls=" ${ls} " 1482 nols=""
1444 newls="" 1483 newls=""
1445 for f in ${LINGUAS} ; do 1484 for f in ${LINGUAS} ; do
1446 if [[ ${ls/ ${f} /} != ${ls} ]] ; then 1485 if hasq ${f} ${ls} ; then
1447 newls="${newls} ${f}" 1486 newls="${newls} ${f}"
1448 else 1487 else
1449 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1488 nols="${nols} ${f}"
1450 fi 1489 fi
1451 done 1490 done
1452 if [[ -z ${newls} ]] ; then 1491 [[ -n ${nols} ]] \
1453 export LINGUAS="" 1492 && ewarn "Sorry, but ${PN} does not support the LINGUAs:" ${nols}
1454 else
1455 export LINGUAS=${newls:1} 1493 export LINGUAS=${newls:1}
1456 fi
1457} 1494}
1458 1495
1459# moved from kernel.eclass since they are generally useful outside of 1496# moved from kernel.eclass since they are generally useful outside of
1460# kernel.eclass -iggy (20041002) 1497# kernel.eclass -iggy (20041002)
1461 1498
1490 1527
1491# Jeremy Huddleston <eradicator@gentoo.org>: 1528# Jeremy Huddleston <eradicator@gentoo.org>:
1492# preserve_old_lib /path/to/libblah.so.0 1529# preserve_old_lib /path/to/libblah.so.0
1493# preserve_old_lib_notify /path/to/libblah.so.0 1530# preserve_old_lib_notify /path/to/libblah.so.0
1494# 1531#
1495# These functions are useful when a lib in your package changes --soname. Such 1532# These functions are useful when a lib in your package changes --library. Such
1496# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0 1533# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0
1497# would break packages that link against it. Most people get around this 1534# would break packages that link against it. Most people get around this
1498# by using the portage SLOT mechanism, but that is not always a relevant 1535# by using the portage SLOT mechanism, but that is not always a relevant
1499# solution, so instead you can add the following to your ebuilds: 1536# solution, so instead you can add the following to your ebuilds:
1500# 1537#
1531 1568
1532 ewarn "An old version of an installed library was detected on your system." 1569 ewarn "An old version of an installed library was detected on your system."
1533 ewarn "In order to avoid breaking packages that link against it, this older version" 1570 ewarn "In order to avoid breaking packages that link against it, this older version"
1534 ewarn "is not being removed. In order to make full use of this newer version," 1571 ewarn "is not being removed. In order to make full use of this newer version,"
1535 ewarn "you will need to execute the following command:" 1572 ewarn "you will need to execute the following command:"
1536 ewarn " revdep-rebuild --soname ${SONAME}" 1573 ewarn " revdep-rebuild --library ${SONAME}"
1537 ewarn 1574 ewarn
1538 ewarn "After doing that, you can safely remove ${LIB}" 1575 ewarn "After doing that, you can safely remove ${LIB}"
1539 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild" 1576 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1540 fi 1577 fi
1541} 1578}
1552built_with_use() { 1589built_with_use() {
1553 local opt=$1 1590 local opt=$1
1554 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1591 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1555 1592
1556 local PKG=$(best_version $1) 1593 local PKG=$(best_version $1)
1594 [[ -z ${PKG} ]] && die "Unable to resolve $1 to an installed package"
1557 shift 1595 shift
1558 1596
1559 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE" 1597 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
1560 [[ ! -e ${USEFILE} ]] && return 1 1598
1599 # if the USE file doesnt exist, assume the $PKG is either
1600 # injected or package.provided
1601 [[ ! -e ${USEFILE} ]] && die "Unable to determine what USE flags $PKG was built with"
1561 1602
1562 local USE_BUILT=$(<${USEFILE}) 1603 local USE_BUILT=$(<${USEFILE})
1563 while [[ $# -gt 0 ]] ; do 1604 while [[ $# -gt 0 ]] ; do
1564 if [[ ${opt} = "-o" ]] ; then 1605 if [[ ${opt} = "-o" ]] ; then
1565 has $1 ${USE_BUILT} && return 0 1606 has $1 ${USE_BUILT} && return 0
1622 # We don't want to quote ${bin} so that people can pass complex 1663 # We don't want to quote ${bin} so that people can pass complex
1623 # things as $bin ... "./someprog --args" 1664 # things as $bin ... "./someprog --args"
1624 cat << EOF > "${tmpwrapper}" 1665 cat << EOF > "${tmpwrapper}"
1625#!/bin/sh 1666#!/bin/sh
1626cd "${chdir:-.}" 1667cd "${chdir:-.}"
1668if [ -n "${libdir}" ] ; then
1627if [ "\${LD_LIBRARY_PATH+set}" = "set" ] && [ -n "${libdir}" ] ; then 1669 if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
1628 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}" 1670 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1671 else
1672 export LD_LIBRARY_PATH="${libdir}"
1673 fi
1629fi 1674fi
1630exec ${bin} "\$@" 1675exec ${bin} "\$@"
1631EOF 1676EOF
1632 chmod go+rx "${tmpwrapper}" 1677 chmod go+rx "${tmpwrapper}"
1633 if [[ -n ${path} ]] ; then 1678 if [[ -n ${path} ]] ; then

Legend:
Removed from v.1.207  
changed lines
  Added in v.1.248

  ViewVC Help
Powered by ViewVC 1.1.20