| 1 |
commit: e2dc3cab8c699de77402ad3262847a18ac567b7c |
| 2 |
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Oct 30 10:25:01 2020 +0000 |
| 4 |
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Oct 30 10:27:12 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=e2dc3cab |
| 7 |
|
| 8 |
Convert some more dependencies to multilib-portage variant |
| 9 |
|
| 10 |
Signed-off-by: Thomas Sachau <tommy <AT> gentoo.org> |
| 11 |
|
| 12 |
lib/portage/dep/__init__.py | 3 ++- |
| 13 |
lib/portage/dep/dep_check.py | 8 ++++++++ |
| 14 |
2 files changed, 10 insertions(+), 1 deletion(-) |
| 15 |
|
| 16 |
diff --git a/lib/portage/dep/__init__.py b/lib/portage/dep/__init__.py |
| 17 |
index 3f0ef7ece..767c24ede 100644 |
| 18 |
--- a/lib/portage/dep/__init__.py |
| 19 |
+++ b/lib/portage/dep/__init__.py |
| 20 |
@@ -939,7 +939,8 @@ class _use_dep: |
| 21 |
missing_disabled.add(flag) |
| 22 |
else: |
| 23 |
if flag in missing_enabled or flag in missing_disabled: |
| 24 |
- raise InvalidAtom(_("Invalid use dep: '%s'") % (x,)) |
| 25 |
+ if flag != "multilib_abi_x86" and flag != "multilib_abi_amd64": |
| 26 |
+ raise InvalidAtom(_("Invalid use dep: '%s'") % (x,)) |
| 27 |
no_default.add(flag) |
| 28 |
|
| 29 |
self.tokens = use |
| 30 |
|
| 31 |
diff --git a/lib/portage/dep/dep_check.py b/lib/portage/dep/dep_check.py |
| 32 |
index 815a4b06b..e5d19f7e5 100644 |
| 33 |
--- a/lib/portage/dep/dep_check.py |
| 34 |
+++ b/lib/portage/dep/dep_check.py |
| 35 |
@@ -119,8 +119,16 @@ def _expand_new_virtuals(mysplit, edebug, mydbapi, mysettings, myroot="/", |
| 36 |
use_tokens = list(x.unevaluated_atom.use.tokens) |
| 37 |
if 'abi_x86_64' in use_tokens: |
| 38 |
use_tokens[use_tokens.index('abi_x86_64')] = 'multilib_abi_amd64' |
| 39 |
+ if 'abi_x86_64(-)' in use_tokens: |
| 40 |
+ use_tokens[use_tokens.index('abi_x86_64(-)')] = 'multilib_abi_amd64(-)' |
| 41 |
+ if 'abi_x86_64(-)?' in use_tokens: |
| 42 |
+ use_tokens[use_tokens.index('abi_x86_64(-)?')] = 'multilib_abi_amd64(-)?' |
| 43 |
if 'abi_x86_32' in use_tokens: |
| 44 |
use_tokens[use_tokens.index('abi_x86_32')] = 'multilib_abi_x86' |
| 45 |
+ if 'abi_x86_32(-)' in use_tokens: |
| 46 |
+ use_tokens[use_tokens.index('abi_x86_32(-)')] = 'multilib_abi_x86(-)' |
| 47 |
+ if 'abi_x86_32(-)?' in use_tokens: |
| 48 |
+ use_tokens[use_tokens.index('abi_x86_32(-)?')] = 'multilib_abi_x86(-)?' |
| 49 |
use_tokens.extend(multilib_flags) |
| 50 |
x = Atom(x.unevaluated_atom.without_use + |
| 51 |
"[%s]" % (",".join(use_tokens))) |
Archives