[gentoo-commits] proj/portage:multilib commit in: pym/portage/package/ebuild/

[Thomas Sachau]

commit:     0e3ff687bb04f06f761392838e1841c46f179852
Author:     Nathan Phillip Brink <binki <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 16 03:27:18 2011 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Wed Nov 16 20:07:28 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=0e3ff687

Finish adding support for unilib systems (where MULTILIB_ABIS=${ARCH}), automatically enabling DEFAULT_ABI.

---
 pym/portage/package/ebuild/config.py |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/ebuild/config.py
index e10174f..1518a7a 100644
--- a/pym/portage/package/ebuild/config.py
+++ b/pym/portage/package/ebuild/config.py
@@ -436,7 +436,7 @@ class config(object):
 					mygcfg = {}
 			self.configlist.append(mygcfg)
 			self.configdict["defaults"]=self.configlist[-1]
-			if self.configdict["defaults"].get("MULTILIB_ABIS", "").count(' ') != 0:
+			if self.configdict["defaults"].get('DEFAULT_ABI', None) is not None:
 				self.configdict["defaults"]["USE"] = self.configdict["defaults"].get("USE", "") + " multilib_abi_" + self.configdict["defaults"].get("DEFAULT_ABI", "")
 
 			mygcfg = getconfig(
@@ -1228,7 +1228,7 @@ class config(object):
 				if pkg_defaults:
 					defaults.extend(pkg_defaults)
 		defaults = " ".join(defaults)
-		if self.configdict["defaults"].get("MULTILIB_ABIS", "").count(' ') != 0:
+		if self.configdict["defaults"].get('DEFAULT_ABI', None) is not None:
 			defaults = defaults + " multilib_abi_" + self.configdict["defaults"].get("DEFAULT_ABI", "")
 		if defaults != self.configdict["defaults"].get("USE",""):
 			self.configdict["defaults"]["USE"] = defaults
@@ -1467,9 +1467,8 @@ class config(object):
 		# FEATURES=test for all ebuilds, regardless of explicit IUSE.
 		iuse_implicit.add("test")
 
-		if self['MULTILIB_ABIS'].count(' ') != 0:
-			for multilib_abis in self.get('MULTILIB_ABIS', '').split(' '):
-				iuse_implicit.add("multilib_abi_" + multilib_abis)
+		for multilib_abis in self.get('MULTILIB_ABIS', '').split(' '):
+			iuse_implicit.add("multilib_abi_" + multilib_abis)
 
 		return iuse_implicit