Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 148702 | Differences between
and this patch

Collapse All | Expand All

(-)pym/portage.py (+15 lines)
Lines 1693-1698 Link Here
1693
		cp = dep_getkey(mycpv)
1693
		cp = dep_getkey(mycpv)
1694
		cpv_slot = self.mycpv
1694
		cpv_slot = self.mycpv
1695
		pkginternaluse = ""
1695
		pkginternaluse = ""
1696
		iuse = ""
1696
		if mydb:
1697
		if mydb:
1697
			slot, iuse = mydb.aux_get(self.mycpv, ["SLOT", "IUSE"])
1698
			slot, iuse = mydb.aux_get(self.mycpv, ["SLOT", "IUSE"])
1698
			cpv_slot = "%s:%s" % (self.mycpv, slot)
1699
			cpv_slot = "%s:%s" % (self.mycpv, slot)
Lines 1753-1758 Link Here
1753
			has_changed = True
1754
			has_changed = True
1754
		self.configdict["pkg"]["PKGUSE"] = self.puse[:] # For saving to PUSE file
1755
		self.configdict["pkg"]["PKGUSE"] = self.puse[:] # For saving to PUSE file
1755
		self.configdict["pkg"]["USE"]    = self.puse[:] # this gets appended to USE
1756
		self.configdict["pkg"]["USE"]    = self.puse[:] # this gets appended to USE
1757
		self.configdict["pkg"]["IUSE"] = iuse
1756
		# CATEGORY is essential for doebuild calls
1758
		# CATEGORY is essential for doebuild calls
1757
		self.configdict["pkg"]["CATEGORY"] = mycpv.split("/")[0]
1759
		self.configdict["pkg"]["CATEGORY"] = mycpv.split("/")[0]
1758
		if has_changed:
1760
		if has_changed:
Lines 1974-1979 Link Here
1974
				# exports them as empty.  This is required for vars such as
1976
				# exports them as empty.  This is required for vars such as
1975
				# LINGUAS, where unset and empty have different meanings.
1977
				# LINGUAS, where unset and empty have different meanings.
1976
				self[var] = " ".join(var_split)
1978
				self[var] = " ".join(var_split)
1979
			else:
1980
				# if unset, we enable everything in IUSE that's not masked
1981
				iuse = self.configdict["pkg"].get("IUSE")
1982
				if iuse:
1983
					var_split = []
1984
					for x in iuse.split():
1985
						x = x.lstrip("+-")
1986
						if x.startswith(prefix) and x not in self.usemask:
1987
							var_split.append(x[prefix_len:])
1988
							usesplit.append(x)
1989
					if var_split:
1990
						self[var] = " ".join(var_split)
1991
						usesplit.sort()
1977
1992
1978
		# Pre-Pend ARCH variable to USE settings so '-*' in env doesn't kill arch.
1993
		# Pre-Pend ARCH variable to USE settings so '-*' in env doesn't kill arch.
1979
		if self.configdict["defaults"].has_key("ARCH"):
1994
		if self.configdict["defaults"].has_key("ARCH"):

Return to bug 148702