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

Diff of /eclass/eutils.eclass

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

Revision 1.205 Revision 1.252
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.205 2005/10/07 15:31:46 flameeyes Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.252 2006/10/05 00:12:07 nyhm 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
419 ;;
420 *-netbsd*|*-openbsd*)
421 grep "$2:\*:" /etc/$1
434 ;; 422 ;;
435 *) 423 *)
436 type -p nscd >& /dev/null && nscd -i "$1" 424 type -p nscd >& /dev/null && nscd -i "$1"
437 getent "$1" "$2" 425 getent "$1" "$2"
438 ;; 426 ;;
451# shell: /bin/false 439# shell: /bin/false
452# homedir: /dev/null 440# homedir: /dev/null
453# groups: none 441# groups: none
454# extra: comment of 'added by portage for ${PN}' 442# extra: comment of 'added by portage for ${PN}'
455enewuser() { 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
456 # get the username 451 # get the username
457 local euser=$1; shift 452 local euser=$1; shift
458 if [[ -z ${euser} ]] ; then 453 if [[ -z ${euser} ]] ; then
459 eerror "No username specified !" 454 eerror "No username specified !"
460 die "Cannot call enewuser without a username" 455 die "Cannot call enewuser without a username"
492 einfo " - Userid: ${euid}" 487 einfo " - Userid: ${euid}"
493 488
494 # handle shell 489 # handle shell
495 local eshell=$1; shift 490 local eshell=$1; shift
496 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then 491 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
497 if [[ ! -e ${eshell} ]] ; then 492 if [[ ! -e ${ROOT}${eshell} ]] ; then
498 eerror "A shell was specified but it does not exist !" 493 eerror "A shell was specified but it does not exist !"
499 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"
500 fi 499 fi
501 else 500 else
502 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
503 [[ -x ${ROOT}${shell} ]] && break 502 [[ -x ${ROOT}${shell} ]] && break
504 done 503 done
575 einfo "Please report the ebuild along with the info below" 574 einfo "Please report the ebuild along with the info below"
576 einfo "eextra: $@" 575 einfo "eextra: $@"
577 die "Required function missing" 576 die "Required function missing"
578 fi 577 fi
579 ;; 578 ;;
580 *-freebsd*) 579 *-freebsd*|*-dragonfly*)
581 if [[ -z $@ ]] ; then 580 if [[ -z $@ ]] ; then
582 pw useradd ${euser} ${opts} \ 581 pw useradd ${euser} ${opts} \
583 -c "added by portage for ${PN}" \ 582 -c "added by portage for ${PN}" \
584 die "enewuser failed" 583 die "enewuser failed"
585 else 584 else
586 einfo " - Extra: $@" 585 einfo " - Extra: $@"
587 pw useradd ${euser} ${opts} \ 586 pw useradd ${euser} ${opts} \
588 "$@" || die "enewuser failed" 587 "$@" || die "enewuser failed"
589 fi 588 fi
590 ;; 589 ;;
590
591 *-netbsd*)
592 if [[ -z $@ ]] ; then
593 useradd ${opts} ${euser} || die "enewuser failed"
594 else
595 einfo " - Extra: $@"
596 useradd ${opts} ${euser} "$@" || die "enewuser failed"
597 fi
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
591 *) 613 *)
592 if [[ -z $@ ]] ; then 614 if [[ -z $@ ]] ; then
593 useradd ${opts} ${euser} \ 615 useradd ${opts} ${euser} \
594 -c "added by portage for ${PN}" \ 616 -c "added by portage for ${PN}" \
595 || die "enewuser failed" 617 || die "enewuser failed"
619# Default values if you do not specify any: 641# Default values if you do not specify any:
620# groupname: REQUIRED ! 642# groupname: REQUIRED !
621# gid: next available (see groupadd(8)) 643# gid: next available (see groupadd(8))
622# extra: none 644# extra: none
623enewgroup() { 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
624 # get the group 653 # get the group
625 local egroup="$1"; shift 654 local egroup="$1"; shift
626 if [ -z "${egroup}" ] 655 if [ -z "${egroup}" ]
627 then 656 then
628 eerror "No group specified !" 657 eerror "No group specified !"
690 esac 719 esac
691 dscl . create /groups/${egroup} gid ${egid} 720 dscl . create /groups/${egroup} gid ${egid}
692 dscl . create /groups/${egroup} passwd '*' 721 dscl . create /groups/${egroup} passwd '*'
693 ;; 722 ;;
694 723
695 *-freebsd*) 724 *-freebsd*|*-dragonfly*)
696 case ${egid} in 725 case ${egid} in
697 *[!0-9]*) # Non numeric 726 *[!0-9]*) # Non numeric
698 for egid in $(seq 101 999); do 727 for egid in $(seq 101 999); do
699 [ -z "`egetent group ${egid}`" ] && break 728 [ -z "`egetent group ${egid}`" ] && break
700 done 729 done
701 esac 730 esac
702 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 731 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
703 ;; 732 ;;
733
734 *-netbsd*)
735 case ${egid} in
736 *[!0-9]*) # Non numeric
737 for egid in $(seq 101 999); do
738 [ -z "`egetent group ${egid}`" ] && break
739 done
740 esac
741 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
742 ;;
743
704 *) 744 *)
705 groupadd ${opts} ${egroup} || die "enewgroup failed" 745 groupadd ${opts} ${egroup} || die "enewgroup failed"
706 ;; 746 ;;
707 esac 747 esac
708 export SANDBOX_ON="${oldsandbox}" 748 export SANDBOX_ON="${oldsandbox}"
729 769
730# Make a desktop file ! 770# Make a desktop file !
731# Great for making those icons in kde/gnome startmenu ! 771# Great for making those icons in kde/gnome startmenu !
732# Amaze your friends ! Get the women ! Join today ! 772# Amaze your friends ! Get the women ! Join today !
733# 773#
734# make_desktop_entry(<binary>, [name], [icon], [type], [path]) 774# make_desktop_entry(<command>, [name], [icon], [type], [path])
735# 775#
736# binary: what binary does the app run with ? 776# binary: what command does the app run with ?
737# name: the name that will show up in the menu 777# name: the name that will show up in the menu
738# icon: give your little like a pretty little icon ... 778# icon: give your little like a pretty little icon ...
739# this can be relative (to /usr/share/pixmaps) or 779# this can be relative (to /usr/share/pixmaps) or
740# a full path to an icon 780# a full path to an icon
741# type: what kind of application is this ? for categories: 781# type: what kind of application is this ? for categories:
777 games) 817 games)
778 case ${catmin} in 818 case ${catmin} in
779 action) type=ActionGame;; 819 action) type=ActionGame;;
780 arcade) type=ArcadeGame;; 820 arcade) type=ArcadeGame;;
781 board) type=BoardGame;; 821 board) type=BoardGame;;
782 kid) type=KidsGame;; 822 kids) type=KidsGame;;
783 emulation) type=Emulator;; 823 emulation) type=Emulator;;
784 puzzle) type=LogicGame;; 824 puzzle) type=LogicGame;;
785 rpg) type=RolePlaying;; 825 rpg) type=RolePlaying;;
786 roguelike) type=RolePlaying;; 826 roguelike) type=RolePlaying;;
787 simulation) type=Simulation;; 827 simulation) type=Simulation;;
823 type="Network;${type}" 863 type="Network;${type}"
824 ;; 864 ;;
825 865
826 sci) 866 sci)
827 case ${catmin} in 867 case ${catmin} in
828 astro*) type=Astronomoy;; 868 astro*) type=Astronomy;;
829 bio*) type=Biology;; 869 bio*) type=Biology;;
830 calc*) type=Calculator;; 870 calc*) type=Calculator;;
831 chem*) type=Chemistry;; 871 chem*) type=Chemistry;;
832 geo*) type=Geology;; 872 geo*) type=Geology;;
833 math*) type=Math;; 873 math*) type=Math;;
853 local desktop_name="${PN}" 893 local desktop_name="${PN}"
854 else 894 else
855 local desktop_name="${PN}-${SLOT}" 895 local desktop_name="${PN}-${SLOT}"
856 fi 896 fi
857 local desktop=${T}/${exec%% *}-${desktop_name}.desktop 897 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
898# local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
858 899
859echo "[Desktop Entry] 900echo "[Desktop Entry]
860Encoding=UTF-8 901Encoding=UTF-8
861Version=0.9.2 902Version=0.9.2
862Name=${name} 903Name=${name}
863Type=Application 904Type=Application
864Comment=${DESCRIPTION} 905Comment=${DESCRIPTION}
865Exec=${exec} 906Exec=${exec}
907TryExec=${exec%% *}
866Path=${path} 908Path=${path}
867Icon=${icon} 909Icon=${icon}
868Categories=Application;${type};" > "${desktop}" 910Categories=Application;${type};" > "${desktop}"
869 911
870 ( 912 (
985 local sizeoff_t=$2 1027 local sizeoff_t=$2
986 1028
987 [[ -z ${src} ]] && die "Could not locate source for '$1'" 1029 [[ -z ${src} ]] && die "Could not locate source for '$1'"
988 [[ -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 :("
989 1031
990 local shrtsrc="`basename ${src}`" 1032 local shrtsrc=$(basename "${src}")
991 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1033 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
992 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1034 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
993 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\"`
994 1036
995 # grab metadata for debug reasons 1037 # grab metadata for debug reasons
1059# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1101# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1060# - If the file is not specified then unpack will utilize ${A}. 1102# - If the file is not specified then unpack will utilize ${A}.
1061# - 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
1062# the proper offset from the script itself. 1104# the proper offset from the script itself.
1063unpack_makeself() { 1105unpack_makeself() {
1106 local src_input=${1:-${A}}
1064 local src=$(find_unpackable_file "$1") 1107 local src=$(find_unpackable_file "${src_input}")
1065 local skip=$2 1108 local skip=$2
1066 local exe=$3 1109 local exe=$3
1067 1110
1068 [[ -z ${src} ]] && die "Could not locate source for '$1'" 1111 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1069 1112
1070 local shrtsrc=$(basename "${src}") 1113 local shrtsrc=$(basename "${src}")
1071 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1114 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1072 if [ -z "${skip}" ] 1115 if [[ -z ${skip} ]] ; then
1073 then
1074 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1116 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1075 local skip=0 1117 local skip=0
1076 exe=tail 1118 exe=tail
1077 case ${ver} in 1119 case ${ver} in
1078 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
1079 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1121 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1080 ;; 1122 ;;
1081 2.0|2.0.1) 1123 2.0|2.0.1)
1082 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-) 1124 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-)
1083 ;; 1125 ;;
1091 ;; 1133 ;;
1092 2.1.3) 1134 2.1.3)
1093 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1135 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1094 let skip="skip + 1" 1136 let skip="skip + 1"
1095 ;; 1137 ;;
1096 2.1.4) 1138 2.1.4|2.1.5)
1097 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)
1098 skip=$(head -n ${skip} "${src}" | wc -c) 1140 skip=$(head -n ${skip} "${src}" | wc -c)
1099 exe="dd" 1141 exe="dd"
1100 ;; 1142 ;;
1101 *) 1143 *)
1206# 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
1207# found at CDROM_ROOT. 1249# found at CDROM_ROOT.
1208# 1250#
1209# 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',
1210# 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
1211# 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_#
1212# 1258#
1213# 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.
1214# 1260#
1215# 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] [...]
1216# - 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
1220 # 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
1221 # the # of files they gave us 1267 # the # of files they gave us
1222 local cdcnt=0 1268 local cdcnt=0
1223 local f= 1269 local f=
1224 for f in "$@" ; do 1270 for f in "$@" ; do
1225 cdcnt=$((cdcnt + 1)) 1271 ((++cdcnt))
1226 export CDROM_CHECK_${cdcnt}="$f" 1272 export CDROM_CHECK_${cdcnt}="$f"
1227 done 1273 done
1228 export CDROM_TOTAL_CDS=${cdcnt} 1274 export CDROM_TOTAL_CDS=${cdcnt}
1229 export CDROM_CURRENT_CD=1 1275 export CDROM_CURRENT_CD=1
1230 1276
1231 # now we see if the user gave use CD_ROOT ... 1277 # now we see if the user gave use CD_ROOT ...
1232 # 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
1233 if [[ ! -z ${CD_ROOT} ]] ; then
1234 export CDROM_ROOT=${CD_ROOT}
1235 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1236 return
1237 fi
1238 # do the same for CD_ROOT_X
1239 if [[ ! -z ${CD_ROOT_1} ]] ; then 1279 if [[ -n ${CD_ROOT}${CD_ROOT_1} ]] ; then
1240 local var= 1280 local var=
1241 cdcnt=0 1281 cdcnt=0
1242 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1282 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1243 cdcnt=$((cdcnt + 1)) 1283 ((++cdcnt))
1244 var="CD_ROOT_${cdcnt}" 1284 var="CD_ROOT_${cdcnt}"
1285 [[ -z ${!var} ]] && var="CD_ROOT"
1245 if [[ -z ${!var} ]] ; then 1286 if [[ -z ${!var} ]] ; then
1246 eerror "You must either use just the CD_ROOT" 1287 eerror "You must either use just the CD_ROOT"
1247 eerror "or specify ALL the CD_ROOT_X variables." 1288 eerror "or specify ALL the CD_ROOT_X variables."
1248 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."
1249 die "could not locate CD_ROOT_${cdcnt}" 1290 die "could not locate CD_ROOT_${cdcnt}"
1250 fi 1291 fi
1251 export CDROM_ROOTS_${cdcnt}="${!var}"
1252 done 1292 done
1253 export CDROM_ROOT=${CDROM_ROOTS_1} 1293 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1254 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}
1255 return 1301 return
1256 fi 1302 fi
1257 1303
1304 # User didn't help us out so lets make sure they know they can
1305 # simplify the whole process ...
1258 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1306 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1259 einfon "This ebuild will need the " 1307 einfo "This ebuild will need the ${CDROM_NAME:-cdrom for ${PN}}"
1260 if [[ -z ${CDROM_NAME} ]] ; then
1261 echo "cdrom for ${PN}."
1262 else
1263 echo "${CDROM_NAME}."
1264 fi
1265 echo 1308 echo
1266 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"
1267 einfo "mounted somewhere on your filesystem, just export" 1310 einfo "mounted somewhere on your filesystem, just export"
1268 einfo "the variable CD_ROOT so that it points to the" 1311 einfo "the variable CD_ROOT so that it points to the"
1269 einfo "directory containing the files." 1312 einfo "directory containing the files."
1270 echo 1313 echo
1271 einfo "For example:" 1314 einfo "For example:"
1272 einfo "export CD_ROOT=/mnt/cdrom" 1315 einfo "export CD_ROOT=/mnt/cdrom"
1273 echo 1316 echo
1274 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
1275 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1327 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1276 cdcnt=0 1328 cdcnt=0
1277 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1329 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1278 cdcnt=$((cdcnt + 1)) 1330 ((++cdcnt))
1279 var="CDROM_NAME_${cdcnt}" 1331 var="CDROM_NAME_${cdcnt}"
1280 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}" 1332 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1281 done 1333 done
1282 echo 1334 echo
1283 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"
1284 einfo "mounted somewhere on your filesystem, just export" 1336 einfo "mounted somewhere on your filesystem, just export"
1285 einfo "the following variables so they point to the right place:" 1337 einfo "the following variables so they point to the right place:"
1286 einfon "" 1338 einfon ""
1287 cdcnt=0 1339 cdcnt=0
1288 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1340 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1289 cdcnt=$((cdcnt + 1)) 1341 ((++cdcnt))
1290 echo -n " CD_ROOT_${cdcnt}" 1342 echo -n " CD_ROOT_${cdcnt}"
1291 done 1343 done
1292 echo 1344 echo
1293 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"
1294 einfo "you only have one cdrom, you can export CD_ROOT" 1346 einfo "you only have one cdrom, you can export CD_ROOT"
1297 echo 1349 echo
1298 einfo "For example:" 1350 einfo "For example:"
1299 einfo "export CD_ROOT_1=/mnt/cdrom" 1351 einfo "export CD_ROOT_1=/mnt/cdrom"
1300 echo 1352 echo
1301 fi 1353 fi
1354
1355 export CDROM_SET=""
1302 export CDROM_CURRENT_CD=0 1356 export CDROM_CURRENT_CD=0
1303 cdrom_load_next_cd 1357 cdrom_load_next_cd
1304} 1358}
1305 1359
1306# 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.
1307# 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.
1308# 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.
1309# 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.
1310cdrom_load_next_cd() { 1364cdrom_load_next_cd() {
1311 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1312 local var= 1365 local var
1313 1366 ((++CDROM_CURRENT_CD))
1314 if [[ ! -z ${CD_ROOT} ]] ; then
1315 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1316 return
1317 fi
1318 1367
1319 unset CDROM_ROOT 1368 unset CDROM_ROOT
1320 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1369 var=CD_ROOT_${CDROM_CURRENT_CD}
1370 [[ -z ${!var} ]] && var="CD_ROOT"
1321 if [[ -z ${!var} ]] ; then 1371 if [[ -z ${!var} ]] ; then
1322 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1372 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1323 cdrom_locate_file_on_cd ${!var} 1373 _cdrom_locate_file_on_cd ${!var}
1324 else 1374 else
1325 export CDROM_ROOT=${!var} 1375 export CDROM_ROOT=${!var}
1326 fi 1376 fi
1327 1377
1328 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1378 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1333# 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
1334# 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
1335# displayed and we'll hang out here until: 1385# displayed and we'll hang out here until:
1336# (1) the file is found on a mounted cdrom 1386# (1) the file is found on a mounted cdrom
1337# (2) the user hits CTRL+C 1387# (2) the user hits CTRL+C
1338cdrom_locate_file_on_cd() { 1388_cdrom_locate_file_on_cd() {
1389 local mline=""
1390 local showedmsg=0
1391
1339 while [[ -z ${CDROM_ROOT} ]] ; do 1392 while [[ -z ${CDROM_ROOT} ]] ; do
1340 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}]})
1341 local file=$(basename "$*") 1401 local file=$(basename ${cdset[${i}]})
1342 local mline=""
1343 local showedmsg=0
1344 1402
1345 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
1346 [[ -d ${mline}/${dir} ]] || continue 1404 [[ -d ${mline}/${dir} ]] || continue
1347 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \ 1405 if [[ -n $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] ; then
1348 && 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))
1349 done 1414 done
1350 1415
1351 if [[ -z ${CDROM_ROOT} ]] ; then
1352 echo 1416 echo
1353 if [[ ${showedmsg} -eq 0 ]] ; then 1417 if [[ ${showedmsg} -eq 0 ]] ; then
1354 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1418 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1355 if [[ -z ${CDROM_NAME} ]] ; then 1419 if [[ -z ${CDROM_NAME} ]] ; then
1356 einfo "Please insert the cdrom for ${PN} now !" 1420 einfo "Please insert+mount the cdrom for ${PN} now !"
1357 else
1358 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1359 fi
1360 else 1421 else
1361 if [[ -z ${CDROM_NAME_1} ]] ; then
1362 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1363 else
1364 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1365 einfo "Please insert+mount the ${!var} cdrom now !" 1422 einfo "Please insert+mount the ${CDROM_NAME} cdrom now !"
1366 fi
1367 fi 1423 fi
1368 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
1369 fi 1431 fi
1432 showedmsg=1
1433 fi
1370 einfo "Press return to scan for the cd again" 1434 einfo "Press return to scan for the cd again"
1371 einfo "or hit CTRL+C to abort the emerge." 1435 einfo "or hit CTRL+C to abort the emerge."
1372 echo 1436 echo
1373 einfo "If you are having trouble with the detection" 1437 einfo "If you are having trouble with the detection"
1374 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"
1375 einfo "Joliet support enabled in your kernel. Please" 1439 einfo "Joliet support enabled in your kernel. Please"
1376 einfo "check that CONFIG_JOLIET is enabled in your kernel." 1440 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1377 read 1441 read || die "something is screwed with your system"
1378 fi
1379 done 1442 done
1380} 1443}
1381 1444
1382# Make sure that LINGUAS only contains languages that 1445# Make sure that LINGUAS only contains languages that
1383# a package can support 1446# a package can support
1390# 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
1391# directories and uses the intersection of the lists. 1454# directories and uses the intersection of the lists.
1392# 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
1393# directories and uses the union of the lists. 1456# directories and uses the union of the lists.
1394strip-linguas() { 1457strip-linguas() {
1395 local ls newls 1458 local ls newls nols
1396 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then 1459 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1397 local op=$1; shift 1460 local op=$1; shift
1398 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1461 ls=$(find "$1" -name '*.po' -exec basename {} .po \;); shift
1399 local d f 1462 local d f
1400 for d in "$@" ; do 1463 for d in "$@" ; do
1401 if [[ ${op} == "-u" ]] ; then 1464 if [[ ${op} == "-u" ]] ; then
1402 newls=${ls} 1465 newls=${ls}
1403 else 1466 else
1404 newls="" 1467 newls=""
1405 fi 1468 fi
1406 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1469 for f in $(find "$d" -name '*.po' -exec basename {} .po \;) ; do
1407 if [[ ${op} == "-i" ]] ; then 1470 if [[ ${op} == "-i" ]] ; then
1408 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}" 1471 hasq ${f} ${ls} && newls="${newls} ${f}"
1409 else 1472 else
1410 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}" 1473 hasq ${f} ${ls} || newls="${newls} ${f}"
1411 fi 1474 fi
1412 done 1475 done
1413 ls=${newls} 1476 ls=${newls}
1414 done 1477 done
1415 ls=${ls//.po}
1416 else 1478 else
1417 ls=$@ 1479 ls="$@"
1418 fi 1480 fi
1419 1481
1420 ls=" ${ls} " 1482 nols=""
1421 newls="" 1483 newls=""
1422 for f in ${LINGUAS} ; do 1484 for f in ${LINGUAS} ; do
1423 if [[ ${ls/ ${f} /} != ${ls} ]] ; then 1485 if hasq ${f} ${ls} ; then
1424 newls="${newls} ${f}" 1486 newls="${newls} ${f}"
1425 else 1487 else
1426 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1488 nols="${nols} ${f}"
1427 fi 1489 fi
1428 done 1490 done
1429 if [[ -z ${newls} ]] ; then 1491 [[ -n ${nols} ]] \
1430 export LINGUAS="" 1492 && ewarn "Sorry, but ${PN} does not support the LINGUAs:" ${nols}
1431 else
1432 export LINGUAS=${newls:1} 1493 export LINGUAS=${newls:1}
1433 fi
1434} 1494}
1435 1495
1436# moved from kernel.eclass since they are generally useful outside of 1496# moved from kernel.eclass since they are generally useful outside of
1437# kernel.eclass -iggy (20041002) 1497# kernel.eclass -iggy (20041002)
1438 1498
1467 1527
1468# Jeremy Huddleston <eradicator@gentoo.org>: 1528# Jeremy Huddleston <eradicator@gentoo.org>:
1469# preserve_old_lib /path/to/libblah.so.0 1529# preserve_old_lib /path/to/libblah.so.0
1470# preserve_old_lib_notify /path/to/libblah.so.0 1530# preserve_old_lib_notify /path/to/libblah.so.0
1471# 1531#
1472# 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
1473# 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
1474# 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
1475# 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
1476# solution, so instead you can add the following to your ebuilds: 1536# solution, so instead you can add the following to your ebuilds:
1477# 1537#
1508 1568
1509 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."
1510 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"
1511 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,"
1512 ewarn "you will need to execute the following command:" 1572 ewarn "you will need to execute the following command:"
1513 ewarn " revdep-rebuild --soname ${SONAME}" 1573 ewarn " revdep-rebuild --library ${SONAME}"
1514 ewarn 1574 ewarn
1515 ewarn "After doing that, you can safely remove ${LIB}" 1575 ewarn "After doing that, you can safely remove ${LIB}"
1516 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild" 1576 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1517 fi 1577 fi
1518} 1578}
1529built_with_use() { 1589built_with_use() {
1530 local opt=$1 1590 local opt=$1
1531 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1591 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1532 1592
1533 local PKG=$(best_version $1) 1593 local PKG=$(best_version $1)
1594 [[ -z ${PKG} ]] && die "Unable to resolve $1 to an installed package"
1534 shift 1595 shift
1535 1596
1536 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE" 1597 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
1537 [[ ! -e ${USEFILE} ]] && return 1 1598 local IUSEFILE=${ROOT}/var/db/pkg/${PKG}/IUSE
1599
1600 # if the USE file doesnt exist, assume the $PKG is either
1601 # injected or package.provided
1602 [[ ! -e ${USEFILE} ]] && die "Unable to determine what USE flags $PKG was built with"
1603
1604 local IUSE_BUILT=$(<${IUSEFILE})
1605 # Don't check USE_EXPAND #147237
1606 local expand
1607 for expand in $(echo ${USE_EXPAND} | tr '[:upper:]' '[:lower:]') ; do
1608 if [[ $1 == ${expand}_* ]] ; then
1609 expand=""
1610 break
1611 fi
1612 done
1613 if [[ -n ${expand} ]] ; then
1614 has $1 ${IUSE_BUILT} || die "$PKG does not actually support the $1 USE flag!"
1615 fi
1538 1616
1539 local USE_BUILT=$(<${USEFILE}) 1617 local USE_BUILT=$(<${USEFILE})
1540 while [[ $# -gt 0 ]] ; do 1618 while [[ $# -gt 0 ]] ; do
1541 if [[ ${opt} = "-o" ]] ; then 1619 if [[ ${opt} = "-o" ]] ; then
1542 has $1 ${USE_BUILT} && return 0 1620 has $1 ${USE_BUILT} && return 0
1599 # We don't want to quote ${bin} so that people can pass complex 1677 # We don't want to quote ${bin} so that people can pass complex
1600 # things as $bin ... "./someprog --args" 1678 # things as $bin ... "./someprog --args"
1601 cat << EOF > "${tmpwrapper}" 1679 cat << EOF > "${tmpwrapper}"
1602#!/bin/sh 1680#!/bin/sh
1603cd "${chdir:-.}" 1681cd "${chdir:-.}"
1682if [ -n "${libdir}" ] ; then
1604if [ "\${LD_LIBRARY_PATH+set}" = "set" ] && [ -n "${libdir}" ] ; then 1683 if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
1605 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}" 1684 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1685 else
1686 export LD_LIBRARY_PATH="${libdir}"
1687 fi
1606fi 1688fi
1607exec ${bin} "\$@" 1689exec ${bin} "\$@"
1608EOF 1690EOF
1609 chmod go+rx "${tmpwrapper}" 1691 chmod go+rx "${tmpwrapper}"
1610 if [[ -n ${path} ]] ; then 1692 if [[ -n ${path} ]] ; then

Legend:
Removed from v.1.205  
changed lines
  Added in v.1.252

  ViewVC Help
Powered by ViewVC 1.1.20