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

Diff of /eclass/eutils.eclass

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

Revision 1.228 Revision 1.263
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.228 2006/03/10 23:24:21 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.263 2006/11/13 20:58:41 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 lib 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
88# Default extension for patches 91# Default extension for patches
89EPATCH_SUFFIX="patch.bz2" 92EPATCH_SUFFIX="patch.bz2"
90# Default options for patch 93# Default options for patch
91# 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
92# 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.
93EPATCH_OPTS="-g0 --no-backup-if-mismatch" 97EPATCH_OPTS="-g0 -E --no-backup-if-mismatch"
94# 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,
95# and not the full path .. 99# and not the full path ..
96EPATCH_EXCLUDE="" 100EPATCH_EXCLUDE=""
97# Change the printed message for a single patch. 101# Change the printed message for a single patch.
98EPATCH_SINGLE_MSG="" 102EPATCH_SINGLE_MSG=""
137# 141#
138# <azarah@gentoo.org> (10 Nov 2002) 142# <azarah@gentoo.org> (10 Nov 2002)
139# 143#
140epatch() { 144epatch() {
141 _epatch_draw_line() { 145 _epatch_draw_line() {
142 # this func produces a lot of pointless noise when debugging is turned on ... 146 [[ -z $1 ]] && set "$(printf "%65s" '')"
143 local is_debug=0 147 echo "${1//?/=}"
144 [[ $- == *x* ]] && is_debug=1 && set +x
145
146 local i=0 str_length="" str_out=""
147
148 # Handle calls that do not have args, or wc not being installed ...
149 if [[ -z $1 ]] || ! type -p wc >/dev/null ; then
150 str_length=65
151 else
152 str_length=$(echo -n "$*" | wc -m)
153 fi
154
155 while ((i++ < ${str_length})) ; do
156 str_out="${str_out}="
157 done
158 echo ${str_out}
159
160 [[ ${is_debug} -eq 1 ]] && set -x
161 return 0
162 } 148 }
163 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; } 149 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; }
164 local PIPE_CMD="" 150 local PIPE_CMD=""
165 local STDERR_TARGET="${T}/$$.out" 151 local STDERR_TARGET="${T}/$$.out"
166 local PATCH_TARGET="${T}/$$.patch" 152 local PATCH_TARGET="${T}/$$.patch"
453# shell: /bin/false 439# shell: /bin/false
454# homedir: /dev/null 440# homedir: /dev/null
455# groups: none 441# groups: none
456# extra: comment of 'added by portage for ${PN}' 442# extra: comment of 'added by portage for ${PN}'
457enewuser() { 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
458 # get the username 451 # get the username
459 local euser=$1; shift 452 local euser=$1; shift
460 if [[ -z ${euser} ]] ; then 453 if [[ -z ${euser} ]] ; then
461 eerror "No username specified !" 454 eerror "No username specified !"
462 die "Cannot call enewuser without a username" 455 die "Cannot call enewuser without a username"
463 fi 456 fi
464 457
465 # lets see if the username already exists 458 # lets see if the username already exists
466 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then 459 if [[ -n $(egetent passwd "${euser}") ]] ; then
467 return 0 460 return 0
468 fi 461 fi
469 einfo "Adding user '${euser}' to your system ..." 462 einfo "Adding user '${euser}' to your system ..."
470 463
471 # options to pass to useradd 464 # options to pass to useradd
472 local opts= 465 local opts=
473 466
474 # handle uid 467 # handle uid
475 local euid=$1; shift 468 local euid=$1; shift
476 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then 469 if [[ -n ${euid} && ${euid} != -1 ]] ; then
477 if [[ ${euid} -gt 0 ]] ; then 470 if [[ ${euid} -gt 0 ]] ; then
478 if [[ ! -z $(egetent passwd ${euid}) ]] ; then 471 if [[ -n $(egetent passwd ${euid}) ]] ; then
479 euid="next" 472 euid="next"
480 fi 473 fi
481 else 474 else
482 eerror "Userid given but is not greater than 0 !" 475 eerror "Userid given but is not greater than 0 !"
483 die "${euid} is not a valid UID" 476 die "${euid} is not a valid UID"
484 fi 477 fi
485 else 478 else
486 euid="next" 479 euid="next"
487 fi 480 fi
488 if [[ ${euid} == "next" ]] ; then 481 if [[ ${euid} == "next" ]] ; then
489 for euid in $(seq 101 999) ; do 482 for ((euid = 101; euid <= 999; euid++)); do
490 [[ -z $(egetent passwd ${euid}) ]] && break 483 [[ -z $(egetent passwd ${euid}) ]] && break
491 done 484 done
492 fi 485 fi
493 opts="${opts} -u ${euid}" 486 opts="${opts} -u ${euid}"
494 einfo " - Userid: ${euid}" 487 einfo " - Userid: ${euid}"
508 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
509 [[ -x ${ROOT}${shell} ]] && break 502 [[ -x ${ROOT}${shell} ]] && break
510 done 503 done
511 504
512 if [[ ${shell} == "/dev/null" ]] ; then 505 if [[ ${shell} == "/dev/null" ]] ; then
513 eerror "Unable to identify the shell to use" 506 eerror "Unable to identify the shell to use, proceeding with userland default."
514 die "Unable to identify the shell to use" 507 case ${USERLAND} in
508 GNU) shell="/bin/false" ;;
509 BSD) shell="/sbin/nologin" ;;
510 Darwin) shell="/usr/sbin/nologin" ;;
511 *) die "Unable to identify the default shell for userland ${USERLAND}"
512 esac
515 fi 513 fi
516 514
517 eshell=${shell} 515 eshell=${shell}
518 fi 516 fi
519 einfo " - Shell: ${eshell}" 517 einfo " - Shell: ${eshell}"
648# Default values if you do not specify any: 646# Default values if you do not specify any:
649# groupname: REQUIRED ! 647# groupname: REQUIRED !
650# gid: next available (see groupadd(8)) 648# gid: next available (see groupadd(8))
651# extra: none 649# extra: none
652enewgroup() { 650enewgroup() {
651 case ${EBUILD_PHASE} in
652 unpack|compile|test|install)
653 eerror "'enewgroup()' called from '${EBUILD_PHASE}()' which is not a pkg_* function."
654 eerror "Package fails at QA and at life. Please file a bug."
655 die "Bad package! enewgroup is only for use in pkg_* functions!"
656 esac
657
653 # get the group 658 # get the group
654 local egroup="$1"; shift 659 local egroup="$1"; shift
655 if [ -z "${egroup}" ] 660 if [ -z "${egroup}" ]
656 then 661 then
657 eerror "No group specified !" 662 eerror "No group specified !"
658 die "Cannot call enewgroup without a group" 663 die "Cannot call enewgroup without a group"
659 fi 664 fi
660 665
661 # see if group already exists 666 # see if group already exists
662 if [ "${egroup}" == "`egetent group \"${egroup}\" | cut -d: -f1`" ] 667 if [[ -n $(egetent group "${egroup}") ]]; then
663 then
664 return 0 668 return 0
665 fi 669 fi
666 einfo "Adding group '${egroup}' to your system ..." 670 einfo "Adding group '${egroup}' to your system ..."
667 671
668 # options to pass to useradd 672 # options to pass to useradd
711 fi 715 fi
712 716
713 # If we need the next available 717 # If we need the next available
714 case ${egid} in 718 case ${egid} in
715 *[!0-9]*) # Non numeric 719 *[!0-9]*) # Non numeric
716 for egid in $(seq 101 999); do 720 for ((egid = 101; egid <= 999; egid++)); do
717 [ -z "`egetent group ${egid}`" ] && break 721 [[ -z $(egetent group ${egid}) ]] && break
718 done 722 done
719 esac 723 esac
720 dscl . create /groups/${egroup} gid ${egid} 724 dscl . create /groups/${egroup} gid ${egid}
721 dscl . create /groups/${egroup} passwd '*' 725 dscl . create /groups/${egroup} passwd '*'
722 ;; 726 ;;
723 727
724 *-freebsd*|*-dragonfly*) 728 *-freebsd*|*-dragonfly*)
725 case ${egid} in 729 case ${egid} in
726 *[!0-9]*) # Non numeric 730 *[!0-9]*) # Non numeric
727 for egid in $(seq 101 999); do 731 for ((egid = 101; egid <= 999; egid++)); do
728 [ -z "`egetent group ${egid}`" ] && break 732 [[ -z $(egetent group ${egid}) ]] && break
729 done 733 done
730 esac 734 esac
731 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 735 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
732 ;; 736 ;;
733 737
734 *-netbsd*) 738 *-netbsd*)
735 case ${egid} in 739 case ${egid} in
736 *[!0-9]*) # Non numeric 740 *[!0-9]*) # Non numeric
737 for egid in $(seq 101 999); do 741 for ((egid = 101; egid <= 999; egid++)); do
738 [ -z "`egetent group ${egid}`" ] && break 742 [[ -z $(egetent group ${egid}) ]] && break
739 done 743 done
740 esac 744 esac
741 groupadd -g ${egid} ${egroup} || die "enewgroup failed" 745 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
742 ;; 746 ;;
743 747
751# Simple script to replace 'dos2unix' binaries 755# Simple script to replace 'dos2unix' binaries
752# vapier@gentoo.org 756# vapier@gentoo.org
753# 757#
754# edos2unix(file, <more files> ...) 758# edos2unix(file, <more files> ...)
755edos2unix() { 759edos2unix() {
756 for f in "$@" 760 echo "$@" | xargs sed -i 's/\r$//'
757 do
758 cp "${f}" ${T}/edos2unix
759 sed 's/\r$//' ${T}/edos2unix > "${f}"
760 done
761} 761}
762 762
763 763
764############################################################## 764##############################################################
765# START: Handle .desktop files and menu entries # 765# START: Handle .desktop files and menu entries #
769 769
770# Make a desktop file ! 770# Make a desktop file !
771# Great for making those icons in kde/gnome startmenu ! 771# Great for making those icons in kde/gnome startmenu !
772# Amaze your friends ! Get the women ! Join today ! 772# Amaze your friends ! Get the women ! Join today !
773# 773#
774# make_desktop_entry(<binary>, [name], [icon], [type], [path]) 774# make_desktop_entry(<command>, [name], [icon], [type], [path])
775# 775#
776# binary: what binary does the app run with ? 776# binary: what command does the app run with ?
777# name: the name that will show up in the menu 777# name: the name that will show up in the menu
778# icon: give your little like a pretty little icon ... 778# icon: give your little like a pretty little icon ...
779# this can be relative (to /usr/share/pixmaps) or 779# this can be relative (to /usr/share/pixmaps) or
780# a full path to an icon 780# a full path to an icon
781# type: what kind of application is this ? for categories: 781# type: what kind of application is this ? for categories:
817 games) 817 games)
818 case ${catmin} in 818 case ${catmin} in
819 action) type=ActionGame;; 819 action) type=ActionGame;;
820 arcade) type=ArcadeGame;; 820 arcade) type=ArcadeGame;;
821 board) type=BoardGame;; 821 board) type=BoardGame;;
822 kid) type=KidsGame;; 822 kids) type=KidsGame;;
823 emulation) type=Emulator;; 823 emulation) type=Emulator;;
824 puzzle) type=LogicGame;; 824 puzzle) type=LogicGame;;
825 rpg) type=RolePlaying;; 825 rpg) type=RolePlaying;;
826 roguelike) type=RolePlaying;; 826 roguelike) type=RolePlaying;;
827 simulation) type=Simulation;; 827 simulation) type=Simulation;;
893 local desktop_name="${PN}" 893 local desktop_name="${PN}"
894 else 894 else
895 local desktop_name="${PN}-${SLOT}" 895 local desktop_name="${PN}-${SLOT}"
896 fi 896 fi
897 local desktop=${T}/${exec%% *}-${desktop_name}.desktop 897 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
898# local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
898 899
899echo "[Desktop Entry] 900echo "[Desktop Entry]
900Encoding=UTF-8 901Encoding=UTF-8
901Version=0.9.2 902Version=0.9.2
902Name=${name} 903Name=${name}
903Type=Application 904Type=Application
904Comment=${DESCRIPTION} 905Comment=${DESCRIPTION}
905Exec=${exec} 906Exec=${exec}
907TryExec=${exec%% *}
906Path=${path} 908Path=${path}
907Icon=${icon} 909Icon=${icon}
908Categories=Application;${type};" > "${desktop}" 910Categories=Application;${type};" > "${desktop}"
909 911
910 ( 912 (
915 ) 917 )
916} 918}
917 919
918# Make a GDM/KDM Session file 920# Make a GDM/KDM Session file
919# 921#
920# make_desktop_entry(<title>, <command>) 922# make_session_desktop(<title>, <command>)
921# title: File to execute to start the Window Manager 923# title: File to execute to start the Window Manager
922# command: Name of the Window Manager 924# command: Name of the Window Manager
923 925
924make_session_desktop() { 926make_session_desktop() {
925 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1 927 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1
1113 if [[ -z ${skip} ]] ; then 1115 if [[ -z ${skip} ]] ; then
1114 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}') 1116 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1115 local skip=0 1117 local skip=0
1116 exe=tail 1118 exe=tail
1117 case ${ver} in 1119 case ${ver} in
1118 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
1119 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1121 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1120 ;; 1122 ;;
1121 2.0|2.0.1) 1123 2.0|2.0.1)
1122 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-) 1124 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-)
1123 ;; 1125 ;;
1157 # lets grab the first few bytes of the file to figure out what kind of archive it is 1159 # lets grab the first few bytes of the file to figure out what kind of archive it is
1158 local tmpfile="$(emktemp)" 1160 local tmpfile="$(emktemp)"
1159 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}" 1161 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}"
1160 local filetype="$(file -b "${tmpfile}")" 1162 local filetype="$(file -b "${tmpfile}")"
1161 case ${filetype} in 1163 case ${filetype} in
1162 *tar\ archive) 1164 *tar\ archive*)
1163 eval ${exe} | tar --no-same-owner -xf - 1165 eval ${exe} | tar --no-same-owner -xf -
1164 ;; 1166 ;;
1165 bzip2*) 1167 bzip2*)
1166 eval ${exe} | bzip2 -dc | tar --no-same-owner -xf - 1168 eval ${exe} | bzip2 -dc | tar --no-same-owner -xf -
1167 ;; 1169 ;;
1203 # accepted ... if we don't find a match, we make the user accept 1205 # accepted ... if we don't find a match, we make the user accept
1204 local shopts=$- 1206 local shopts=$-
1205 local alic 1207 local alic
1206 set -o noglob #so that bash doesn't expand "*" 1208 set -o noglob #so that bash doesn't expand "*"
1207 for alic in ${ACCEPT_LICENSE} ; do 1209 for alic in ${ACCEPT_LICENSE} ; do
1208 if [[ ${alic} == * || ${alic} == ${l} ]]; then 1210 if [[ ${alic} == ${l} ]]; then
1209 set +o noglob; set -${shopts} #reset old shell opts 1211 set +o noglob; set -${shopts} #reset old shell opts
1210 return 0 1212 return 0
1211 fi 1213 fi
1212 done 1214 done
1213 set +o noglob; set -$shopts #reset old shell opts 1215 set +o noglob; set -$shopts #reset old shell opts
1246# 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
1247# found at CDROM_ROOT. 1249# found at CDROM_ROOT.
1248# 1250#
1249# 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',
1250# 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
1251# 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_#
1252# 1258#
1253# 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.
1254# 1260#
1255# 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] [...]
1256# - 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
1307 echo 1313 echo
1308 einfo "For example:" 1314 einfo "For example:"
1309 einfo "export CD_ROOT=/mnt/cdrom" 1315 einfo "export CD_ROOT=/mnt/cdrom"
1310 echo 1316 echo
1311 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
1312 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1327 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1313 cdcnt=0 1328 cdcnt=0
1314 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1329 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1315 ((++cdcnt)) 1330 ((++cdcnt))
1316 var="CDROM_NAME_${cdcnt}" 1331 var="CDROM_NAME_${cdcnt}"
1383 1398
1384 while [[ -n ${cdset[${i}]} ]] ; do 1399 while [[ -n ${cdset[${i}]} ]] ; do
1385 local dir=$(dirname ${cdset[${i}]}) 1400 local dir=$(dirname ${cdset[${i}]})
1386 local file=$(basename ${cdset[${i}]}) 1401 local file=$(basename ${cdset[${i}]})
1387 1402
1388 for mline in $(mount | gawk '/(iso|cdrom|fs=cdfss)/ {print $3}') ; do 1403 local point= node= fs= foo=
1389 [[ -d ${mline}/${dir} ]] || continue 1404 while read point node fs foo ; do
1405 [[ *" ${fs} "* != " cd9660 iso9660 " ]] && continue
1406 point=${point//\040/ }
1390 if [[ -n $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] ; then 1407 [[ -z $(find "${point}/${dir}" -maxdepth 1 -iname "${file}") ]] && continue
1391 export CDROM_ROOT=${mline} 1408 export CDROM_ROOT=${point}
1392 export CDROM_SET=${i} 1409 export CDROM_SET=${i}
1393 export CDROM_MATCH=${cdset[${i}]} 1410 export CDROM_MATCH=${cdset[${i}]}
1394 return 1411 return
1395 fi 1412 done <<< "$(get_mounts)"
1396 done
1397 1413
1398 ((++i)) 1414 ((++i))
1399 done 1415 done
1400 1416
1401 echo 1417 echo
1438# The -i builds a list of po files found in all the 1454# The -i builds a list of po files found in all the
1439# directories and uses the intersection of the lists. 1455# directories and uses the intersection of the lists.
1440# The -u builds a list of po files found in all the 1456# The -u builds a list of po files found in all the
1441# directories and uses the union of the lists. 1457# directories and uses the union of the lists.
1442strip-linguas() { 1458strip-linguas() {
1443 local ls newls 1459 local ls newls nols
1444 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then 1460 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1445 local op=$1; shift 1461 local op=$1; shift
1446 ls=" $(find "$1" -name '*.po' -exec basename {} \;) "; shift 1462 ls=$(find "$1" -name '*.po' -exec basename {} .po \;); shift
1447 local d f 1463 local d f
1448 for d in "$@" ; do 1464 for d in "$@" ; do
1449 if [[ ${op} == "-u" ]] ; then 1465 if [[ ${op} == "-u" ]] ; then
1450 newls=${ls} 1466 newls=${ls}
1451 else 1467 else
1452 newls="" 1468 newls=""
1453 fi 1469 fi
1454 for f in $(find "$d" -name '*.po' -exec basename {} \;) ; do 1470 for f in $(find "$d" -name '*.po' -exec basename {} .po \;) ; do
1455 if [[ ${op} == "-i" ]] ; then 1471 if [[ ${op} == "-i" ]] ; then
1456 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}" 1472 hasq ${f} ${ls} && newls="${newls} ${f}"
1457 else 1473 else
1458 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}" 1474 hasq ${f} ${ls} || newls="${newls} ${f}"
1459 fi 1475 fi
1460 done 1476 done
1461 ls=${newls} 1477 ls=${newls}
1462 done 1478 done
1463 ls=${ls//.po}
1464 else 1479 else
1465 ls=$@ 1480 ls="$@"
1466 fi 1481 fi
1467 1482
1468 ls=" ${ls} " 1483 nols=""
1469 newls="" 1484 newls=""
1470 for f in ${LINGUAS} ; do 1485 for f in ${LINGUAS} ; do
1471 if [[ ${ls/ ${f} /} != ${ls} ]] ; then 1486 if hasq ${f} ${ls} ; then
1472 newls="${newls} ${f}" 1487 newls="${newls} ${f}"
1473 else 1488 else
1474 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1489 nols="${nols} ${f}"
1475 fi 1490 fi
1476 done 1491 done
1477 if [[ -z ${newls} ]] ; then 1492 [[ -n ${nols} ]] \
1478 export LINGUAS="" 1493 && ewarn "Sorry, but ${PN} does not support the LINGUAs:" ${nols}
1479 else
1480 export LINGUAS=${newls:1} 1494 export LINGUAS=${newls:1}
1481 fi
1482} 1495}
1483 1496
1484# moved from kernel.eclass since they are generally useful outside of 1497# moved from kernel.eclass since they are generally useful outside of
1485# kernel.eclass -iggy (20041002) 1498# kernel.eclass -iggy (20041002)
1486 1499
1577built_with_use() { 1590built_with_use() {
1578 local opt=$1 1591 local opt=$1
1579 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1592 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1580 1593
1581 local PKG=$(best_version $1) 1594 local PKG=$(best_version $1)
1595 [[ -z ${PKG} ]] && die "Unable to resolve $1 to an installed package"
1582 shift 1596 shift
1583 1597
1584 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE 1598 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
1599 local IUSEFILE=${ROOT}/var/db/pkg/${PKG}/IUSE
1585 1600
1586 # if the USE file doesnt exist, assume the $PKG is either 1601 # if the USE file doesnt exist, assume the $PKG is either
1587 # injected or package.provided 1602 # injected or package.provided
1588 [[ ! -e ${USEFILE} ]] && return 0 1603 [[ ! -e ${USEFILE} ]] && die "Unable to determine what USE flags $PKG was built with"
1604
1605 local IUSE_BUILT=$(<${IUSEFILE})
1606 # Don't check USE_EXPAND #147237
1607 local expand
1608 for expand in $(echo ${USE_EXPAND} | tr '[:upper:]' '[:lower:]') ; do
1609 if [[ $1 == ${expand}_* ]] ; then
1610 expand=""
1611 break
1612 fi
1613 done
1614 if [[ -n ${expand} ]] ; then
1615 has $1 ${IUSE_BUILT} || die "$PKG does not actually support the $1 USE flag!"
1616 fi
1589 1617
1590 local USE_BUILT=$(<${USEFILE}) 1618 local USE_BUILT=$(<${USEFILE})
1591 while [[ $# -gt 0 ]] ; do 1619 while [[ $# -gt 0 ]] ; do
1592 if [[ ${opt} = "-o" ]] ; then 1620 if [[ ${opt} = "-o" ]] ; then
1593 has $1 ${USE_BUILT} && return 0 1621 has $1 ${USE_BUILT} && return 0

Legend:
Removed from v.1.228  
changed lines
  Added in v.1.263

  ViewVC Help
Powered by ViewVC 1.1.20