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

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

[Thomas Sachau]

commit:     aa2c6ac3fa1890957f6c6cb85795cfc05023c56d
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 31 08:53:49 2011 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Mon Jan 31 08:53:49 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=aa2c6ac3

getRawMissingKeywords: ACCEPT_KEYWORDS, not ARCH

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

diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/ebuild/config.py
index 74dcb3d..81657aa 100644
--- a/pym/portage/package/ebuild/config.py
+++ b/pym/portage/package/ebuild/config.py
@@ -1474,7 +1474,7 @@ class config(object):
 
 		return self._keywords_manager.getRawMissingKeywords(cpv, metadata["SLOT"], \
 			metadata.get("KEYWORDS", ""), metadata.get('repository'), \
-			self["ARCH"], backuped_accept_keywords)
+			self.get("ACCEPT_KEYWORDS", ""), backuped_accept_keywords)
 
 	def _getPKeywords(self, cpv, metadata):
 		global_accept_keywords = self.get("ACCEPT_KEYWORDS", "")

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

[Thomas Sachau]

commit:     394cd4a00d37fd078f8dd40f89f8c810355d7816
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Tue Feb  1 00:11:20 2011 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Tue Feb  1 00:11:20 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=394cd4a0

emerge: spawn nofetch for --pretend --fetch

This is part of bug 353334.

---
 pym/portage/package/ebuild/fetch.py |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/pym/portage/package/ebuild/fetch.py b/pym/portage/package/ebuild/fetch.py
index 99e2a86..c33375c 100644
--- a/pym/portage/package/ebuild/fetch.py
+++ b/pym/portage/package/ebuild/fetch.py
@@ -1107,6 +1107,7 @@ def fetch(myuris, mysettings, listonly=0, fetchonly=0,
 					noiselevel=-1)
 
 			if listonly:
+				failed_files.add(myfile)
 				continue
 			elif fetchonly:
 				failed_files.add(myfile)

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

[Thomas Sachau]

commit:     6343797bc73159dd8b140b378a90b23fcb841d4c
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Tue Feb  1 09:54:01 2011 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Tue Feb  1 09:54:01 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=6343797b

doebuild: always return success for listonly mode

This compensates for changed fetch() return value in commit
394cd4a00d37fd078f8dd40f89f8c810355d7816, which serves to
trigger the pkg_nofetch phase inside doebuild().

---
 pym/portage/package/ebuild/doebuild.py |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/pym/portage/package/ebuild/doebuild.py b/pym/portage/package/ebuild/doebuild.py
index 6fc7489..bbc3a4a 100644
--- a/pym/portage/package/ebuild/doebuild.py
+++ b/pym/portage/package/ebuild/doebuild.py
@@ -737,6 +737,12 @@ def doebuild(myebuild, mydo, myroot, mysettings, debug=0, listonly=0,
 			if not fetch(fetchme, mysettings, listonly=listonly,
 				fetchonly=fetchonly):
 				spawn_nofetch(mydbapi, myebuild, settings=mysettings)
+				if listonly:
+					# The convention for listonly mode is to report
+					# success in any case, even though fetch() may
+					# return unsuccessfully in order to trigger the
+					# nofetch phase.
+					return 0
 				return 1
 
 		if mydo == "fetch":

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

[Thomas Sachau]

commit:     7af8dcf3997cfaf1def14dbfb090242a0751f6a9
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Fri Feb  4 17:17:46 2011 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Fri Feb  4 17:17:46 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=7af8dcf3

ebuild(1): ensure REQUIRED_USE is satisfied

---
 pym/portage/package/ebuild/doebuild.py |   27 +++++++++++++++++++++++++--
 1 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/pym/portage/package/ebuild/doebuild.py b/pym/portage/package/ebuild/doebuild.py
index bbc3a4a..2eb9f11 100644
--- a/pym/portage/package/ebuild/doebuild.py
+++ b/pym/portage/package/ebuild/doebuild.py
@@ -39,9 +39,10 @@ from portage.data import portage_gid, portage_uid, secpass, \
 	uid, userpriv_groups
 from portage.dbapi.porttree import _parse_uri_map
 from portage.dbapi.virtual import fakedbapi
-from portage.dep import Atom, paren_enclose, use_reduce
+from portage.dep import Atom, check_required_use, \
+	human_readable_required_use, paren_enclose, use_reduce
 from portage.eapi import eapi_exports_KV, eapi_exports_merge_type, \
-	eapi_exports_replace_vars, \
+	eapi_exports_replace_vars, eapi_has_required_use, \
 	eapi_has_src_prepare_and_src_configure, eapi_has_pkg_pretend
 from portage.elog import elog_process
 from portage.elog.messages import eerror, eqawarn
@@ -1056,6 +1057,28 @@ def _validate_deps(mysettings, myroot, mydo, mydbapi):
 		if mydo not in invalid_dep_exempt_phases:
 			return 1
 
+	if not pkg.built and pkg.metadata["REQUIRED_USE"] and \
+		eapi_has_required_use(pkg.metadata["EAPI"]):
+		result = check_required_use(pkg.metadata["REQUIRED_USE"],
+			pkg.use.enabled, pkg.iuse.is_valid_flag)
+		if not result:
+			reduced_noise = result.tounicode()
+			writemsg("\n  %s\n" % _("The following REQUIRED_USE flag" + \
+				" constraints are unsatisfied:"), noiselevel=-1)
+			writemsg("    %s\n" % reduced_noise,
+				noiselevel=-1)
+			normalized_required_use = \
+				" ".join(pkg.metadata["REQUIRED_USE"].split())
+			if reduced_noise != normalized_required_use:
+				writemsg("\n  %s\n" % _("The above constraints " + \
+					"are a subset of the following complete expression:"),
+					noiselevel=-1)
+				writemsg("    %s\n" % \
+					human_readable_required_use(normalized_required_use),
+					noiselevel=-1)
+			writemsg("\n", noiselevel=-1)
+			return 1
+
 	return os.EX_OK
 
 # XXX This would be to replace getstatusoutput completely.

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

[Thomas Sachau]

commit:     cc26e6eeb8d3046f8e928c4e37b1d390c80c0c35
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Fri Feb  4 17:23:12 2011 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Fri Feb  4 17:23:12 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=cc26e6ee

ebuild(1): skip REQUIRED_USE for some phases

---
 pym/portage/package/ebuild/doebuild.py |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/pym/portage/package/ebuild/doebuild.py b/pym/portage/package/ebuild/doebuild.py
index 2eb9f11..5272f23 100644
--- a/pym/portage/package/ebuild/doebuild.py
+++ b/pym/portage/package/ebuild/doebuild.py
@@ -1057,7 +1057,9 @@ def _validate_deps(mysettings, myroot, mydo, mydbapi):
 		if mydo not in invalid_dep_exempt_phases:
 			return 1
 
-	if not pkg.built and pkg.metadata["REQUIRED_USE"] and \
+	if not pkg.built and \
+		mydo not in ("digest", "help", "manifest") and \
+		pkg.metadata["REQUIRED_USE"] and \
 		eapi_has_required_use(pkg.metadata["EAPI"]):
 		result = check_required_use(pkg.metadata["REQUIRED_USE"],
 			pkg.use.enabled, pkg.iuse.is_valid_flag)

[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
 

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

[Thomas Sachau]

commit:     a9796ea77d63131c6b1ce03ce16d2cb574a10cfc
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 26 12:26:40 2012 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sun Feb 26 12:26:40 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=a9796ea7

config.py: Move multilib behind force-multilib FEATURE

---
 pym/portage/package/ebuild/config.py |   26 ++++++++++++++++----------
 1 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/ebuild/config.py
index c9d1d1d..799a019 100644
--- a/pym/portage/package/ebuild/config.py
+++ b/pym/portage/package/ebuild/config.py
@@ -441,8 +441,10 @@ class config(object):
 					mygcfg = {}
 			self.configlist.append(mygcfg)
 			self.configdict["defaults"]=self.configlist[-1]
-			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", "")
+
+			if 'force-multilib' in confs.get("FEATURES", ""):
+				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(
 				os.path.join(config_root, MAKE_CONF_FILE),
@@ -772,9 +774,10 @@ class config(object):
 					self[var] = default_val
 				self.backup_changes(var)
 
-			#add multilib_abi internally to list of USE_EXPANDed vars
-			self["USE_EXPAND"] = "multilib_abi" + " " + self.get("USE_EXPAND", "")
-			self.backup_changes("USE_EXPAND")
+			if 'force-multilib' in self.get("FEATURES", ""):
+				#add multilib_abi internally to list of USE_EXPANDed vars
+				self["USE_EXPAND"] = "multilib_abi" + " " + self.get("USE_EXPAND", "")
+				self.backup_changes("USE_EXPAND")
 
 			# initialize self.features
 			self.regenerate()
@@ -1286,8 +1289,9 @@ class config(object):
 				if pkg_defaults:
 					defaults.extend(pkg_defaults)
 		defaults = " ".join(defaults)
-		if self.configdict["defaults"].get('DEFAULT_ABI', None) is not None:
-			defaults = defaults + " multilib_abi_" + self.configdict["defaults"].get("DEFAULT_ABI", "")
+		if 'force-multilib' in self.get("FEATURES", ""):
+			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
 			has_changed = True
@@ -1525,8 +1529,9 @@ class config(object):
 		# FEATURES=test for all ebuilds, regardless of explicit IUSE.
 		iuse_implicit.add("test")
 
-		for multilib_abis in self.get('MULTILIB_ABIS', '').split(' '):
-			iuse_implicit.add("multilib_abi_" + multilib_abis)
+		if 'force-multilib' in self.get("FEATURES", ""):
+			for multilib_abis in self.get('MULTILIB_ABIS', '').split(' '):
+				iuse_implicit.add("multilib_abi_" + multilib_abis)
 
 		return iuse_implicit
 
@@ -1935,7 +1940,8 @@ class config(object):
 
 		# Do the USE calculation last because it depends on USE_EXPAND.
 		use_expand = self.get("USE_EXPAND", "").split()
-		use_expand.append("MULTILIB_ABI")
+		if 'force-multilib' in self.get("FEATURES", ""):
+			use_expand.append("MULTILIB_ABI")
 		use_expand_dict = self._use_expand_dict
 		use_expand_dict.clear()
 		for k in use_expand:

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

[Thomas Sachau]

commit:     b156a9884fd820a39841ee183ba696e7b174d5c7
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sun Jul  8 10:25:22 2012 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sun Jul  8 10:25:22 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=b156a988

Fix detection of enabled ABIs via MULTILIB_ABI=...

---
 pym/portage/package/ebuild/config.py |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/ebuild/config.py
index 21313b5..b349ca3 100644
--- a/pym/portage/package/ebuild/config.py
+++ b/pym/portage/package/ebuild/config.py
@@ -2008,6 +2008,8 @@ class config(object):
 
 		# Do the USE calculation last because it depends on USE_EXPAND.
 		use_expand = self.get("USE_EXPAND", "").split()
+		if 'force-multilib' in self.get("FEATURES", ""):
+			use_expand.append("MULTILIB_ABI")
 		use_expand_dict = self._use_expand_dict
 		use_expand_dict.clear()
 		for k in use_expand:

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

[Zac Medico]

commit:     da2c54602be36fd73dedfdc7c0ca03da55d56aa9
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sun Jul  8 18:34:19 2012 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sun Jul  8 18:34:19 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=da2c5460

config: cleanup redundant force-multilib code

---
 pym/portage/package/ebuild/config.py |   24 ++++++++++--------------
 1 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/ebuild/config.py
index b349ca3..35e6a99 100644
--- a/pym/portage/package/ebuild/config.py
+++ b/pym/portage/package/ebuild/config.py
@@ -426,7 +426,6 @@ class config(object):
 			known_repos = []
 			portdir = ""
 			portdir_overlay = ""
-			features = []
 			for confs in [make_globals, make_conf, self.configdict["env"]]:
 				v = confs.get("PORTDIR")
 				if v is not None:
@@ -436,9 +435,6 @@ class config(object):
 				if v is not None:
 					portdir_overlay = v
 					known_repos.extend(shlex_split(v))
-				v = confs.get("FEATURES")
-				if v is not None:
-					features.append(v.split())
 			known_repos = frozenset(known_repos)
 			self["PORTDIR"] = portdir
 			self["PORTDIR_OVERLAY"] = portdir_overlay
@@ -478,11 +474,6 @@ class config(object):
 			self.configlist.append(mygcfg)
 			self.configdict["defaults"]=self.configlist[-1]
 
-			features = stack_lists(features)
-			if 'force-multilib' in features:
-				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(
 				os.path.join(config_root, MAKE_CONF_FILE),
 				tolerant=tolerant, allow_sourcing=True,
@@ -796,10 +787,20 @@ class config(object):
 					self[var] = default_val
 				self.backup_changes(var)
 
+			features = []
+			for x in ("globals", "defaults", "conf", "env"):
+				v = self.configdict[x].get("FEATURES")
+				if v is not None:
+					features.append(v.split())
+			features = stack_lists(features)
+
 			if 'force-multilib' in features:
 				#add multilib_abi internally to list of USE_EXPANDed vars
 				self["USE_EXPAND"] = "MULTILIB_ABI" + " " + self.get("USE_EXPAND", "")
 				self.backup_changes("USE_EXPAND")
+				default_abi = self.configdict["defaults"].get('DEFAULT_ABI', '').strip()
+				if default_abi:
+					self.configdict["defaults"]["USE"] = self.configdict["defaults"].get("USE", "") + " multilib_abi_" + default_abi
 
 			# initialize self.features
 			self.regenerate()
@@ -1354,9 +1355,6 @@ class config(object):
 				if pkg_defaults:
 					defaults.extend(pkg_defaults)
 		defaults = " ".join(defaults)
-		if 'force-multilib' in self.features:
-			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
 			has_changed = True
@@ -2008,8 +2006,6 @@ class config(object):
 
 		# Do the USE calculation last because it depends on USE_EXPAND.
 		use_expand = self.get("USE_EXPAND", "").split()
-		if 'force-multilib' in self.get("FEATURES", ""):
-			use_expand.append("MULTILIB_ABI")
 		use_expand_dict = self._use_expand_dict
 		use_expand_dict.clear()
 		for k in use_expand:

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

[Thomas Sachau]

commit:     185cb4a638b753f01d393f59966e757020960f84
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 22 15:53:38 2012 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sat Sep 22 15:53:38 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=185cb4a6

Re-enable the USE flag for the default ABI by default

---
 pym/portage/package/ebuild/config.py |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/ebuild/config.py
index 3c6b401..d3f7620 100644
--- a/pym/portage/package/ebuild/config.py
+++ b/pym/portage/package/ebuild/config.py
@@ -1372,6 +1372,8 @@ class config(object):
 				if pkg_defaults:
 					defaults.extend(pkg_defaults)
 		defaults = " ".join(defaults)
+		if self.configdict["defaults"].get("MULTILIB_ABIS", "").count(' ') != 0:
+			defaults = defaults + " multilib_abi_" + self.configdict["defaults"].get("DEFAULT_ABI", "")
 		if defaults != self.configdict["defaults"].get("USE",""):
 			self.configdict["defaults"]["USE"] = defaults
 			has_changed = True

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

[Thomas Sachau]

commit:     bc8191896c294d8eb8758649ed87c24be2b2dca4
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 16 19:06:18 2013 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sat Feb 16 19:06:18 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=bc819189

Use self.features, since features is not any more defined

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

diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/ebuild/config.py
index c5ff688..265b924 100644
--- a/pym/portage/package/ebuild/config.py
+++ b/pym/portage/package/ebuild/config.py
@@ -847,7 +847,11 @@ class config(object):
 			if portage._internal_caller:
 				self["PORTAGE_INTERNAL_CALLER"] = "1"
 				self.backup_changes("PORTAGE_INTERNAL_CALLER")
-			if 'force-multilib' in features:
+
+			# initialize self.features
+			self.regenerate()
+
+			if 'force-multilib' in self.features:
 				#add multilib_abi internally to list of USE_EXPANDed vars
 				self["USE_EXPAND"] = "MULTILIB_ABI" + " " + self.get("USE_EXPAND", "")
 				self.backup_changes("USE_EXPAND")
@@ -855,9 +859,6 @@ class config(object):
 				if default_abi:
 					self.configdict["defaults"]["USE"] = self.configdict["defaults"].get("USE", "") + " multilib_abi_" + default_abi
 
-			# initialize self.features
-			self.regenerate()
-
 			if bsd_chflags:
 				self.features.add('chflags')
 

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

[Thomas Sachau]

commit:     d0ce68b3b8306fb09b629b61ba2199fd57a41198
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  7 14:12:55 2018 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sun Jan  7 14:12:55 2018 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=d0ce68b3

Dont run multlib checks until the installation is actually done

 pym/portage/package/ebuild/doebuild.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pym/portage/package/ebuild/doebuild.py b/pym/portage/package/ebuild/doebuild.py
index 56a51458d..6572d4ace 100644
--- a/pym/portage/package/ebuild/doebuild.py
+++ b/pym/portage/package/ebuild/doebuild.py
@@ -2268,6 +2268,16 @@ def _post_src_install_soname_symlinks(mysettings, out):
 	"""
 
 	image_dir = mysettings["D"]
+
+	#only run this function when the installation is actually done and the final
+	#image_dir exists (workaround for multilib-portage as this is first called
+	#before all ABIs are done and the image_dir is created)
+	if not os.path.isdir (image_dir):
+		print(image_dir+" does not exist")
+		return
+	else:
+		print(image_dir+" does exist")
+
 	needed_filename = os.path.join(mysettings["PORTAGE_BUILDDIR"],
 		"build-info", "NEEDED.ELF.2")
 

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

[Thomas Sachau]

commit:     2186b6acaa669b0bf64312d0e5294050f8aaefd0
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  7 14:14:12 2018 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sun Jan  7 14:14:12 2018 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=2186b6ac

Drop debug prints

 pym/portage/package/ebuild/doebuild.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pym/portage/package/ebuild/doebuild.py b/pym/portage/package/ebuild/doebuild.py
index 6572d4ace..f54d3202f 100644
--- a/pym/portage/package/ebuild/doebuild.py
+++ b/pym/portage/package/ebuild/doebuild.py
@@ -2273,10 +2273,7 @@ def _post_src_install_soname_symlinks(mysettings, out):
 	#image_dir exists (workaround for multilib-portage as this is first called
 	#before all ABIs are done and the image_dir is created)
 	if not os.path.isdir (image_dir):
-		print(image_dir+" does not exist")
 		return
-	else:
-		print(image_dir+" does exist")
 
 	needed_filename = os.path.join(mysettings["PORTAGE_BUILDDIR"],
 		"build-info", "NEEDED.ELF.2")