From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 4 Aug 2013 22:08:43 +0000 (-0700)
Subject: Include implicit IUSE vars in binhost Packages.
X-Git-Tag: v2.2.0_alpha194
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=85f53097ed9fad43b713ac9c13f6beff43da760e;p=portage.git

Include implicit IUSE vars in binhost Packages.

These values may be useful for using a binhost without having a local
copy of the profile (bug #470006).
---

diff --git a/pym/portage/dbapi/bintree.py b/pym/portage/dbapi/bintree.py
index 7e30208a3..61ac6b54c 100644
--- a/pym/portage/dbapi/bintree.py
+++ b/pym/portage/dbapi/bintree.py
@@ -317,7 +317,9 @@ class binarytree(object):
 				"ACCEPT_KEYWORDS", "ACCEPT_LICENSE",
 				"ACCEPT_PROPERTIES", "ACCEPT_RESTRICT", "CBUILD",
 				"CONFIG_PROTECT", "CONFIG_PROTECT_MASK", "FEATURES",
-				"GENTOO_MIRRORS", "INSTALL_MASK", "USE"])
+				"GENTOO_MIRRORS", "INSTALL_MASK", "IUSE_IMPLICIT", "USE",
+				"USE_EXPAND", "USE_EXPAND_HIDDEN", "USE_EXPAND_IMPLICIT",
+				"USE_EXPAND_UNPREFIXED"])
 			self._pkgindex_default_pkg_data = {
 				"BUILD_TIME"         : "",
 				"DEFINED_PHASES"     : "",
@@ -1259,6 +1261,16 @@ class binarytree(object):
 			else:
 				header.pop(k, None)
 
+		# These values may be useful for using a binhost without
+		# having a local copy of the profile (bug #470006).
+		for k in self.settings.get("USE_EXPAND_IMPLICIT", "").split():
+			k = "USE_EXPAND_VALUES_" + k
+			v = self.settings.get(k)
+			if v:
+				header[k] = v
+			else:
+				header.pop(k, None)
+
 	def _pkgindex_version_supported(self, pkgindex):
 		version = pkgindex.header.get("VERSION")
 		if version: