commit: a7727547b795a3399883a2b7547657d43978d783
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 9 11:41:55 2022 +0000
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sun Jan 9 11:41:55 2022 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=a7727547
Remove eclass dependencies for NO_AUTO_FLAG
Signed-off-by: Thomas Sachau <tommy <AT> gentoo.org>
lib/portage/dep/dep_check.py | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
diff --git a/lib/portage/dep/dep_check.py b/lib/portage/dep/dep_check.py
index a1c37bcb9..90f0eefe4 100644
--- a/lib/portage/dep/dep_check.py
+++ b/lib/portage/dep/dep_check.py
@@ -133,6 +133,29 @@ def _expand_new_virtuals(mysplit, edebug, mydbapi,
mysettings, myroot="/",
x = Atom(x.unevaluated_atom.without_use
+
"[%s]" % (",".join(use_tokens)))
x = x.evaluate_conditionals(myuse)
+ if not repoman and x.cp in
mysettings.get("NO_AUTO_FLAG", "").split():
+ if x.unevaluated_atom.use is None:
+ use_tokens = []
+ else:
+ use_tokens =
list(x.unevaluated_atom.use.tokens)
+ if 'abi_x86_64' in use_tokens:
+ use_tokens.remove('abi_x86_64')
+ if 'abi_x86_64(-)' in use_tokens:
+ use_tokens.remove('abi_x86_64(-)')
+ if 'abi_x86_64(-)?' in use_tokens:
+ use_tokens.remove('abi_x86_64(-)?')
+ if 'abi_x86_32' in use_tokens:
+ use_tokens.remove('abi_x86_32')
+ if 'abi_x86_32(-)' in use_tokens:
+ use_tokens.remove('abi_x86_32(-)')
+ if 'abi_x86_32(-)?' in use_tokens:
+ use_tokens.remove('abi_x86_32(-)?')
+ if use_tokens:
+ x = Atom(x.unevaluated_atom.without_use
+
+ "[%s]" % (",".join(use_tokens)))
+ else:
+ x = x.unevaluated_atom.without_use
+ x = x.evaluate_conditionals(myuse)
mykey = x.cp
if not mykey.startswith("virtual/"):
newsplit.append(x)
