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

Diff of /eclass/eutils.eclass

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

Revision 1.227 Revision 1.256
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.227 2006/03/10 18:05:39 carlo Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.256 2006/10/31 19:29:12 agriffis 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 local i=0 str_length="" str_out="" 146 [[ -z $1 ]] && set "$(printf "%65s" '')"
143 147 echo "${1//?/=}"
144 # Handle calls that do not have args, or wc not being installed ...
145 if [[ -z $1 ]] || ! type -p wc >/dev/null ; then
146 str_length=65
147 else
148 str_length=$(echo -n "$*" | wc -m)
149 fi
150
151 while ((i++ < ${str_length})) ; do
152 str_out="${str_out}="
153 done
154 echo ${str_out}
155
156 return 0
157 } 148 }
158 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; } 149 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; }
159 local PIPE_CMD="" 150 local PIPE_CMD=""
160 local STDERR_TARGET="${T}/$$.out" 151 local STDERR_TARGET="${T}/$$.out"
161 local PATCH_TARGET="${T}/$$.patch" 152 local PATCH_TARGET="${T}/$$.patch"
448# shell: /bin/false 439# shell: /bin/false
449# homedir: /dev/null 440# homedir: /dev/null
450# groups: none 441# groups: none
451# extra: comment of 'added by portage for ${PN}' 442# extra: comment of 'added by portage for ${PN}'
452enewuser() { 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
453 # get the username 451 # get the username
454 local euser=$1; shift 452 local euser=$1; shift
455 if [[ -z ${euser} ]] ; then 453 if [[ -z ${euser} ]] ; then
456 eerror "No username specified !" 454 eerror "No username specified !"
457 die "Cannot call enewuser without a username" 455 die "Cannot call enewuser without a username"
458 fi 456 fi
459 457
460 # lets see if the username already exists 458 # lets see if the username already exists
461 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then 459 if [[ -n $(egetent passwd "${euser}") ]] ; then
462 return 0 460 return 0
463 fi 461 fi
464 einfo "Adding user '${euser}' to your system ..." 462 einfo "Adding user '${euser}' to your system ..."
465 463
466 # options to pass to useradd 464 # options to pass to useradd
467 local opts= 465 local opts=
468 466
469 # handle uid 467 # handle uid
470 local euid=$1; shift 468 local euid=$1; shift
471 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then 469 if [[ -n ${euid} && ${euid} != -1 ]] ; then
472 if [[ ${euid} -gt 0 ]] ; then 470 if [[ ${euid} -gt 0 ]] ; then
473 if [[ ! -z $(egetent passwd ${euid}) ]] ; then 471 if [[ -n $(egetent passwd ${euid}) ]] ; then
474 euid="next" 472 euid="next"
475 fi 473 fi
476 else 474 else
477 eerror "Userid given but is not greater than 0 !" 475 eerror "Userid given but is not greater than 0 !"
478 die "${euid} is not a valid UID" 476 die "${euid} is not a valid UID"
479 fi 477 fi
480 else 478 else
481 euid="next" 479 euid="next"
482 fi 480 fi
483 if [[ ${euid} == "next" ]] ; then 481 if [[ ${euid} == "next" ]] ; then
484 for euid in $(seq 101 999) ; do 482 for ((euid = 101; euid <= 999; euid++)); do
485 [[ -z $(egetent passwd ${euid}) ]] && break 483 [[ -z $(egetent passwd ${euid}) ]] && break
486 done 484 done
487 fi 485 fi
488 opts="${opts} -u ${euid}" 486 opts="${opts} -u ${euid}"
489 einfo " - Userid: ${euid}" 487 einfo " - Userid: ${euid}"
503 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
504 [[ -x ${ROOT}${shell} ]] && break 502 [[ -x ${ROOT}${shell} ]] && break
505 done 503 done
506 504
507 if [[ ${shell} == "/dev/null" ]] ; then 505 if [[ ${shell} == "/dev/null" ]] ; then
508 eerror "Unable to identify the shell to use" 506 eerror "Unable to identify the shell to use, proceeding with userland default."
509 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
510 fi 513 fi
511 514
512 eshell=${shell} 515 eshell=${shell}
513 fi 516 fi
514 einfo " - Shell: ${eshell}" 517 einfo " - Shell: ${eshell}"
643# Default values if you do not specify any: 646# Default values if you do not specify any:
644# groupname: REQUIRED ! 647# groupname: REQUIRED !
645# gid: next available (see groupadd(8)) 648# gid: next available (see groupadd(8))
646# extra: none 649# extra: none
647enewgroup() { 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
648 # get the group 658 # get the group
649 local egroup="$1"; shift 659 local egroup="$1"; shift
650 if [ -z "${egroup}" ] 660 if [ -z "${egroup}" ]
651 then 661 then
652 eerror "No group specified !" 662 eerror "No group specified !"
653 die "Cannot call enewgroup without a group" 663 die "Cannot call enewgroup without a group"
654 fi 664 fi
655 665
656 # see if group already exists 666 # see if group already exists
657 if [ "${egroup}" == "`egetent group \"${egroup}\" | cut -d: -f1`" ] 667 if [[ -n $(egetent group "${egroup}") ]]; then
658 then
659 return 0 668 return 0
660 fi 669 fi
661 einfo "Adding group '${egroup}' to your system ..." 670 einfo "Adding group '${egroup}' to your system ..."
662 671
663 # options to pass to useradd 672 # options to pass to useradd
706 fi 715 fi
707 716
708 # If we need the next available 717 # If we need the next available
709 case ${egid} in 718 case ${egid} in
710 *[!0-9]*) # Non numeric 719 *[!0-9]*) # Non numeric
711 for egid in $(seq 101 999); do 720 for ((egid = 101; egid <= 999; egid++)); do
712 [ -z "`egetent group ${egid}`" ] && break 721 [[ -z $(egetent group ${egid}) ]] && break
713 done 722 done
714 esac 723 esac
715 dscl . create /groups/${egroup} gid ${egid} 724 dscl . create /groups/${egroup} gid ${egid}
716 dscl . create /groups/${egroup} passwd '*' 725 dscl . create /groups/${egroup} passwd '*'
717 ;; 726 ;;
718 727
719 *-freebsd*|*-dragonfly*) 728 *-freebsd*|*-dragonfly*)
720 case ${egid} in 729 case ${egid} in
721 *[!0-9]*) # Non numeric 730 *[!0-9]*) # Non numeric
722 for egid in $(seq 101 999); do 731 for ((egid = 101; egid <= 999; egid++)); do
723 [ -z "`egetent group ${egid}`" ] && break 732 [[ -z $(egetent group ${egid}) ]] && break
724 done 733 done
725 esac 734 esac
726 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 735 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
727 ;; 736 ;;
728 737
729 *-netbsd*) 738 *-netbsd*)
730 case ${egid} in 739 case ${egid} in
731 *[!0-9]*) # Non numeric 740 *[!0-9]*) # Non numeric
732 for egid in $(seq 101 999); do 741 for ((egid = 101; egid <= 999; egid++)); do
733 [ -z "`egetent group ${egid}`" ] && break 742 [[ -z $(egetent group ${egid}) ]] && break
734 done 743 done
735 esac 744 esac
736 groupadd -g ${egid} ${egroup} || die "enewgroup failed" 745 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
737 ;; 746 ;;
738 747
764 773
765# Make a desktop file ! 774# Make a desktop file !
766# Great for making those icons in kde/gnome startmenu ! 775# Great for making those icons in kde/gnome startmenu !
767# Amaze your friends ! Get the women ! Join today ! 776# Amaze your friends ! Get the women ! Join today !
768# 777#
769# make_desktop_entry(<binary>, [name], [icon], [type], [path]) 778# make_desktop_entry(<command>, [name], [icon], [type], [path])
770# 779#
771# binary: what binary does the app run with ? 780# binary: what command does the app run with ?
772# name: the name that will show up in the menu 781# name: the name that will show up in the menu
773# icon: give your little like a pretty little icon ... 782# icon: give your little like a pretty little icon ...
774# this can be relative (to /usr/share/pixmaps) or 783# this can be relative (to /usr/share/pixmaps) or
775# a full path to an icon 784# a full path to an icon
776# type: what kind of application is this ? for categories: 785# type: what kind of application is this ? for categories:
812 games) 821 games)
813 case ${catmin} in 822 case ${catmin} in
814 action) type=ActionGame;; 823 action) type=ActionGame;;
815 arcade) type=ArcadeGame;; 824 arcade) type=ArcadeGame;;
816 board) type=BoardGame;; 825 board) type=BoardGame;;
817 kid) type=KidsGame;; 826 kids) type=KidsGame;;
818 emulation) type=Emulator;; 827 emulation) type=Emulator;;
819 puzzle) type=LogicGame;; 828 puzzle) type=LogicGame;;
820 rpg) type=RolePlaying;; 829 rpg) type=RolePlaying;;
821 roguelike) type=RolePlaying;; 830 roguelike) type=RolePlaying;;
822 simulation) type=Simulation;; 831 simulation) type=Simulation;;
888 local desktop_name="${PN}" 897 local desktop_name="${PN}"
889 else 898 else
890 local desktop_name="${PN}-${SLOT}" 899 local desktop_name="${PN}-${SLOT}"
891 fi 900 fi
892 local desktop=${T}/${exec%% *}-${desktop_name}.desktop 901 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
902# local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
893 903
894echo "[Desktop Entry] 904echo "[Desktop Entry]
895Encoding=UTF-8 905Encoding=UTF-8
896Version=0.9.2 906Version=0.9.2
897Name=${name} 907Name=${name}
898Type=Application 908Type=Application
899Comment=${DESCRIPTION} 909Comment=${DESCRIPTION}
900Exec=${exec} 910Exec=${exec}
911TryExec=${exec%% *}
901Path=${path} 912Path=${path}
902Icon=${icon} 913Icon=${icon}
903Categories=Application;${type};" > "${desktop}" 914Categories=Application;${type};" > "${desktop}"
904 915
905 ( 916 (
910 ) 921 )
911} 922}
912 923
913# Make a GDM/KDM Session file 924# Make a GDM/KDM Session file
914# 925#
915# make_desktop_entry(<title>, <command>) 926# make_session_desktop(<title>, <command>)
916# title: File to execute to start the Window Manager 927# title: File to execute to start the Window Manager
917# command: Name of the Window Manager 928# command: Name of the Window Manager
918 929
919make_session_desktop() { 930make_session_desktop() {
920 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1 931 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1
1108 if [[ -z ${skip} ]] ; then 1119 if [[ -z ${skip} ]] ; then
1109 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}') 1120 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1110 local skip=0 1121 local skip=0
1111 exe=tail 1122 exe=tail
1112 case ${ver} in 1123 case ${ver} in
1113 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1124 1.5.*|1.6.0-nv) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
1114 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1125 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1115 ;; 1126 ;;
1116 2.0|2.0.1) 1127 2.0|2.0.1)
1117 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-) 1128 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-)
1118 ;; 1129 ;;
1198 # accepted ... if we don't find a match, we make the user accept 1209 # accepted ... if we don't find a match, we make the user accept
1199 local shopts=$- 1210 local shopts=$-
1200 local alic 1211 local alic
1201 set -o noglob #so that bash doesn't expand "*" 1212 set -o noglob #so that bash doesn't expand "*"
1202 for alic in ${ACCEPT_LICENSE} ; do 1213 for alic in ${ACCEPT_LICENSE} ; do
1203 if [[ ${alic} == * || ${alic} == ${l} ]]; then 1214 if [[ ${alic} == ${l} ]]; then
1204 set +o noglob; set -${shopts} #reset old shell opts 1215 set +o noglob; set -${shopts} #reset old shell opts
1205 return 0 1216 return 0
1206 fi 1217 fi
1207 done 1218 done
1208 set +o noglob; set -$shopts #reset old shell opts 1219 set +o noglob; set -$shopts #reset old shell opts
1241# and when the function returns, you can assume that the cd has been 1252# and when the function returns, you can assume that the cd has been
1242# found at CDROM_ROOT. 1253# found at CDROM_ROOT.
1243# 1254#
1244# normally the cdrom functions will refer to the cds as 'cd #1', 'cd #2', 1255# normally the cdrom functions will refer to the cds as 'cd #1', 'cd #2',
1245# etc... if you want to give the cds better names, then just export 1256# etc... if you want to give the cds better names, then just export
1246# the CDROM_NAME_X variables before calling cdrom_get_cds(). 1257# the appropriate CDROM_NAME variable before calling cdrom_get_cds().
1258# - CDROM_NAME="fooie cd" - for when you only want 1 cd
1259# - CDROM_NAME_1="install cd" - for when you want more than 1 cd
1260# CDROM_NAME_2="data cd"
1261# - CDROM_NAME_SET=( "install cd" "data cd" ) - short hand for CDROM_NAME_#
1247# 1262#
1248# for those multi cd ebuilds, see the cdrom_load_next_cd() below. 1263# for those multi cd ebuilds, see the cdrom_load_next_cd() below.
1249# 1264#
1250# Usage: cdrom_get_cds <file on cd1> [file on cd2] [file on cd3] [...] 1265# Usage: cdrom_get_cds <file on cd1> [file on cd2] [file on cd3] [...]
1251# - this will attempt to locate a cd based upon a file that is on 1266# - this will attempt to locate a cd based upon a file that is on
1302 echo 1317 echo
1303 einfo "For example:" 1318 einfo "For example:"
1304 einfo "export CD_ROOT=/mnt/cdrom" 1319 einfo "export CD_ROOT=/mnt/cdrom"
1305 echo 1320 echo
1306 else 1321 else
1322 if [[ -n ${CDROM_NAME_SET} ]] ; then
1323 # Translate the CDROM_NAME_SET array into CDROM_NAME_#
1324 cdcnt=0
1325 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1326 ((++cdcnt))
1327 export CDROM_NAME_${cdcnt}="${CDROM_NAME_SET[$((${cdcnt}-1))]}"
1328 done
1329 fi
1330
1307 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1331 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1308 cdcnt=0 1332 cdcnt=0
1309 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1333 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1310 ((++cdcnt)) 1334 ((++cdcnt))
1311 var="CDROM_NAME_${cdcnt}" 1335 var="CDROM_NAME_${cdcnt}"
1433# The -i builds a list of po files found in all the 1457# The -i builds a list of po files found in all the
1434# directories and uses the intersection of the lists. 1458# directories and uses the intersection of the lists.
1435# The -u builds a list of po files found in all the 1459# The -u builds a list of po files found in all the
1436# directories and uses the union of the lists. 1460# directories and uses the union of the lists.
1437strip-linguas() { 1461strip-linguas() {
1438 local ls newls 1462 local ls newls nols
1439 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then 1463 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1440 local op=$1; shift 1464 local op=$1; shift
1441 ls=" $(find "$1" -name '*.po' -exec basename {} \;) "; shift 1465 ls=$(find "$1" -name '*.po' -exec basename {} .po \;); shift
1442 local d f 1466 local d f
1443 for d in "$@" ; do 1467 for d in "$@" ; do
1444 if [[ ${op} == "-u" ]] ; then 1468 if [[ ${op} == "-u" ]] ; then
1445 newls=${ls} 1469 newls=${ls}
1446 else 1470 else
1447 newls="" 1471 newls=""
1448 fi 1472 fi
1449 for f in $(find "$d" -name '*.po' -exec basename {} \;) ; do 1473 for f in $(find "$d" -name '*.po' -exec basename {} .po \;) ; do
1450 if [[ ${op} == "-i" ]] ; then 1474 if [[ ${op} == "-i" ]] ; then
1451 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}" 1475 hasq ${f} ${ls} && newls="${newls} ${f}"
1452 else 1476 else
1453 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}" 1477 hasq ${f} ${ls} || newls="${newls} ${f}"
1454 fi 1478 fi
1455 done 1479 done
1456 ls=${newls} 1480 ls=${newls}
1457 done 1481 done
1458 ls=${ls//.po}
1459 else 1482 else
1460 ls=$@ 1483 ls="$@"
1461 fi 1484 fi
1462 1485
1463 ls=" ${ls} " 1486 nols=""
1464 newls="" 1487 newls=""
1465 for f in ${LINGUAS} ; do 1488 for f in ${LINGUAS} ; do
1466 if [[ ${ls/ ${f} /} != ${ls} ]] ; then 1489 if hasq ${f} ${ls} ; then
1467 newls="${newls} ${f}" 1490 newls="${newls} ${f}"
1468 else 1491 else
1469 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1492 nols="${nols} ${f}"
1470 fi 1493 fi
1471 done 1494 done
1472 if [[ -z ${newls} ]] ; then 1495 [[ -n ${nols} ]] \
1473 export LINGUAS="" 1496 && ewarn "Sorry, but ${PN} does not support the LINGUAs:" ${nols}
1474 else
1475 export LINGUAS=${newls:1} 1497 export LINGUAS=${newls:1}
1476 fi
1477} 1498}
1478 1499
1479# moved from kernel.eclass since they are generally useful outside of 1500# moved from kernel.eclass since they are generally useful outside of
1480# kernel.eclass -iggy (20041002) 1501# kernel.eclass -iggy (20041002)
1481 1502
1572built_with_use() { 1593built_with_use() {
1573 local opt=$1 1594 local opt=$1
1574 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1595 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1575 1596
1576 local PKG=$(best_version $1) 1597 local PKG=$(best_version $1)
1598 [[ -z ${PKG} ]] && die "Unable to resolve $1 to an installed package"
1577 shift 1599 shift
1578 1600
1579 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE 1601 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
1602 local IUSEFILE=${ROOT}/var/db/pkg/${PKG}/IUSE
1580 1603
1581 # if the USE file doesnt exist, assume the $PKG is either 1604 # if the USE file doesnt exist, assume the $PKG is either
1582 # injected or package.provided 1605 # injected or package.provided
1583 [[ ! -e ${USEFILE} ]] && return 0 1606 [[ ! -e ${USEFILE} ]] && die "Unable to determine what USE flags $PKG was built with"
1607
1608 local IUSE_BUILT=$(<${IUSEFILE})
1609 # Don't check USE_EXPAND #147237
1610 local expand
1611 for expand in $(echo ${USE_EXPAND} | tr '[:upper:]' '[:lower:]') ; do
1612 if [[ $1 == ${expand}_* ]] ; then
1613 expand=""
1614 break
1615 fi
1616 done
1617 if [[ -n ${expand} ]] ; then
1618 has $1 ${IUSE_BUILT} || die "$PKG does not actually support the $1 USE flag!"
1619 fi
1584 1620
1585 local USE_BUILT=$(<${USEFILE}) 1621 local USE_BUILT=$(<${USEFILE})
1586 while [[ $# -gt 0 ]] ; do 1622 while [[ $# -gt 0 ]] ; do
1587 if [[ ${opt} = "-o" ]] ; then 1623 if [[ ${opt} = "-o" ]] ; then
1588 has $1 ${USE_BUILT} && return 0 1624 has $1 ${USE_BUILT} && return 0

Legend:
Removed from v.1.227  
changed lines
  Added in v.1.256

  ViewVC Help
Powered by ViewVC 1.1.20