[gentoo-commits] proj/portage:multilib commit in: lib/portage/dep/

[Thomas Sachau]

commit:     e2dc3cab8c699de77402ad3262847a18ac567b7c
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 30 10:25:01 2020 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Fri Oct 30 10:27:12 2020 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=e2dc3cab

Convert some more dependencies to multilib-portage variant

Signed-off-by: Thomas Sachau <tommy <AT> gentoo.org>

 lib/portage/dep/__init__.py  | 3 ++-
 lib/portage/dep/dep_check.py | 8 ++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/lib/portage/dep/__init__.py b/lib/portage/dep/__init__.py
index 3f0ef7ece..767c24ede 100644
--- a/lib/portage/dep/__init__.py
+++ b/lib/portage/dep/__init__.py
@@ -939,7 +939,8 @@ class _use_dep:
                                        missing_disabled.add(flag)
                        else:
                                if flag in missing_enabled or flag in 
missing_disabled:
-                                       raise InvalidAtom(_("Invalid use dep: 
'%s'") % (x,))
+                                       if flag != "multilib_abi_x86" and flag 
!= "multilib_abi_amd64":
+                                               raise InvalidAtom(_("Invalid 
use dep: '%s'") % (x,))
                                no_default.add(flag)
 
                self.tokens = use

diff --git a/lib/portage/dep/dep_check.py b/lib/portage/dep/dep_check.py
index 815a4b06b..e5d19f7e5 100644
--- a/lib/portage/dep/dep_check.py
+++ b/lib/portage/dep/dep_check.py
@@ -119,8 +119,16 @@ def _expand_new_virtuals(mysplit, edebug, mydbapi, 
mysettings, myroot="/",
                                                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_64(-)' in use_tokens:
+                                               
use_tokens[use_tokens.index('abi_x86_64(-)')] = 'multilib_abi_amd64(-)'
+                                       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'
+                                       if 'abi_x86_32(-)' in use_tokens:
+                                               
use_tokens[use_tokens.index('abi_x86_32(-)')] = 'multilib_abi_x86(-)'
+                                       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)))