| 1 |
commit: a7727547b795a3399883a2b7547657d43978d783 |
| 2 |
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jan 9 11:41:55 2022 +0000 |
| 4 |
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jan 9 11:41:55 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=a7727547 |
| 7 |
|
| 8 |
Remove eclass dependencies for NO_AUTO_FLAG |
| 9 |
|
| 10 |
Signed-off-by: Thomas Sachau <tommy <AT> gentoo.org> |
| 11 |
|
| 12 |
lib/portage/dep/dep_check.py | 23 +++++++++++++++++++++++ |
| 13 |
1 file changed, 23 insertions(+) |
| 14 |
|
| 15 |
diff --git a/lib/portage/dep/dep_check.py b/lib/portage/dep/dep_check.py |
| 16 |
index a1c37bcb9..90f0eefe4 100644 |
| 17 |
--- a/lib/portage/dep/dep_check.py |
| 18 |
+++ b/lib/portage/dep/dep_check.py |
| 19 |
@@ -133,6 +133,29 @@ def _expand_new_virtuals(mysplit, edebug, mydbapi, mysettings, myroot="/", |
| 20 |
x = Atom(x.unevaluated_atom.without_use + |
| 21 |
"[%s]" % (",".join(use_tokens))) |
| 22 |
x = x.evaluate_conditionals(myuse) |
| 23 |
+ if not repoman and x.cp in mysettings.get("NO_AUTO_FLAG", "").split(): |
| 24 |
+ if x.unevaluated_atom.use is None: |
| 25 |
+ use_tokens = [] |
| 26 |
+ else: |
| 27 |
+ use_tokens = list(x.unevaluated_atom.use.tokens) |
| 28 |
+ if 'abi_x86_64' in use_tokens: |
| 29 |
+ use_tokens.remove('abi_x86_64') |
| 30 |
+ if 'abi_x86_64(-)' in use_tokens: |
| 31 |
+ use_tokens.remove('abi_x86_64(-)') |
| 32 |
+ if 'abi_x86_64(-)?' in use_tokens: |
| 33 |
+ use_tokens.remove('abi_x86_64(-)?') |
| 34 |
+ if 'abi_x86_32' in use_tokens: |
| 35 |
+ use_tokens.remove('abi_x86_32') |
| 36 |
+ if 'abi_x86_32(-)' in use_tokens: |
| 37 |
+ use_tokens.remove('abi_x86_32(-)') |
| 38 |
+ if 'abi_x86_32(-)?' in use_tokens: |
| 39 |
+ use_tokens.remove('abi_x86_32(-)?') |
| 40 |
+ if use_tokens: |
| 41 |
+ x = Atom(x.unevaluated_atom.without_use + |
| 42 |
+ "[%s]" % (",".join(use_tokens))) |
| 43 |
+ else: |
| 44 |
+ x = x.unevaluated_atom.without_use |
| 45 |
+ x = x.evaluate_conditionals(myuse) |
| 46 |
mykey = x.cp |
| 47 |
if not mykey.startswith("virtual/"): |
| 48 |
newsplit.append(x) |
Archives