commit: 259272b9ffcf2c3d813487bf0119f761f32476e6 Author: Thomas Sachau <tommy <AT> gentoo <DOT> org> AuthorDate: Sun Oct 4 13:23:22 2015 +0000 Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org> CommitDate: Sun Oct 4 13:23:22 2015 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=259272b9
Convert forced flags from new multilib eclass to the matching ones from multilib-portage pym/portage/dep/dep_check.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pym/portage/dep/dep_check.py b/pym/portage/dep/dep_check.py index dab6961..4e97ffa 100644 --- a/pym/portage/dep/dep_check.py +++ b/pym/portage/dep/dep_check.py @@ -84,11 +84,14 @@ def _expand_new_virtuals(mysplit, edebug, mydbapi, mysettings, myroot="/", use_tokens = [] else: use_tokens = list(x.unevaluated_atom.use.tokens) + if 'abi_x86_64' in use_tokens: + use_tokens[use_tokens.index('abi_x86_64')] = 'multilib_abi_amd64' + if 'abi_x86_32' in use_tokens: + use_tokens[use_tokens.index('abi_x86_32')] = 'multilib_abi_x86' use_tokens.extend(multilib_flags) x = Atom(x.unevaluated_atom.without_use + "[%s]" % (",".join(use_tokens))) x = x.evaluate_conditionals(myuse) - mykey = x.cp if not mykey.startswith("virtual/"): newsplit.append(x)