From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 24 Jul 2006 15:25:37 +0000 (-0000)
Subject: Trigger a rebuild with --newuse when IUSE has changed for bug #116955.
X-Git-Tag: v2.1.1~145
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=62fed2da570bf8a72076d5062d688474ad31b2e8;p=portage.git

Trigger a rebuild with --newuse when IUSE has changed for bug #116955.

svn path=/main/trunk/; revision=4014
---

diff --git a/bin/emerge b/bin/emerge
index 06e1473ca..83584a9cf 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -746,7 +746,10 @@ class depgraph:
 				vardbapi.cpv_exists(mykey):
 				old_use = vardbapi.aux_get(mykey, ["USE"])[0].split()
 				iuses = set(mydbapi.aux_get(mykey, ["IUSE"])[0].split())
-				if iuses.intersection(old_use) != \
+				if iuses.difference(
+					vardbapi.aux_get(mykey, ["IUSE"])[0].split()):
+					merging = 1
+				elif iuses.intersection(old_use) != \
 					iuses.intersection(myuse):
 					merging=1