From: Mike Frysinger <vapier@gentoo.org>
Date: Sat, 17 Feb 2007 00:11:42 +0000 (+0000)
Subject: combine USE and IUSE file existence check
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0ab9d59ab0d19e33162cc129e6de056021cbe083;p=gentoo.git

combine USE and IUSE file existence check
---

diff --git a/eclass/eutils.eclass b/eclass/eutils.eclass
index 7765685d860e..b820fe399e73 100644
--- a/eclass/eutils.eclass
+++ b/eclass/eutils.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.273 2007/02/14 16:49:46 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.274 2007/02/17 00:11:42 vapier Exp $
 #
 # This eclass is for general purpose functions that most ebuilds
 # have to implement themselves.
@@ -1650,13 +1650,9 @@ built_with_use() {
 	local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
 	local IUSEFILE=${ROOT}/var/db/pkg/${PKG}/IUSE
 
-	# if the USE file doesnt exist, assume the $PKG is either
-	# injected or package.provided
-	[[ ! -e ${USEFILE} ]] && die "Unable to determine what USE flags $PKG was built with"
-
 	# if the IUSE file doesn't exist, the read will error out, we need to handle
 	# this gracefully
-	if [[ ! -e ${IUSEFILE} ]] ; then
+	if [[ ! -e ${USEFILE} ]] || [[ ! -e ${IUSEFILE} ]] ; then
 		case ${missing_action} in
 			true)	return 0;;
 			false)	return 1;;