[patches.git] / built_with_use.patch

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.248
diff -u -p -r1.248 eutils.eclass
--- eutils.eclass	19 Aug 2006 13:52:02 -0000	1.248
+++ eutils.eclass	10 Sep 2006 08:09:57 -0000
@@ -1595,11 +1595,15 @@ built_with_use() {
 	shift
 
 	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"
 
+	local IUSE_BUILT=$(<${IUSEFILE})
+	has $1 ${IUSE_BUILT} || die "$PKG does not actually support the $1 USE flag!"
+
 	local USE_BUILT=$(<${USEFILE})
 	while [[ $# -gt 0 ]] ; do
 		if [[ ${opt} = "-o" ]] ; then
Commit	Line	Data
	1	Index: eutils.eclass
	2	===================================================================
	3	RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
	4	retrieving revision 1.248
	5	diff -u -p -r1.248 eutils.eclass
	6	--- eutils.eclass 19 Aug 2006 13:52:02 -0000 1.248
	7	+++ eutils.eclass 10 Sep 2006 08:09:57 -0000
	8	@@ -1595,11 +1595,15 @@ built_with_use() {
	9	shift
	10
	11	local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
	12	+ local IUSEFILE=${ROOT}/var/db/pkg/${PKG}/IUSE
	13
	14	# if the USE file doesnt exist, assume the $PKG is either
	15	# injected or package.provided
	16	[[ ! -e ${USEFILE} ]] && die "Unable to determine what USE flags $PKG was built with"
	17
	18	+ local IUSE_BUILT=$(<${IUSEFILE})
	19	+ has $1 ${IUSE_BUILT} \|\| die "$PKG does not actually support the $1 USE flag!"
	20	+
	21	local USE_BUILT=$(<${USEFILE})
	22	while [[ $# -gt 0 ]] ; do
	23	if [[ ${opt} = "-o" ]] ; then