Display flags that have been removed from IUSE as (-flag%) instead of !flag% and...

svn path=/main/trunk/; revision=4350

diff --git a/bin/emerge b/bin/emerge
index 9d6b8fa63c37918286690f2ee7be400c891e3928..5e8e0fabc70f0508a6ed54c628f3545677ec25b8 100755 (executable)
--- a/bin/emerge
+++ b/bin/emerge
@@ -1346,16 +1346,19 @@ class depgraph:
                                                        flag_str = green(flag) + "*"
                                        elif flag in removed_iuse:
                                                if all_flags:
-                                                       flag_str = yellow("!" + flag) + "%"
+                                                       flag_str = yellow("-" + flag) + "%"
                                                        if flag in old_use:
                                                                flag_str += "*"
+                                                       flag_str = "(" + flag_str + ")"
                                                        removed.append(flag_str)
                                                continue
                                        else:
                                                if is_new or flag in old_iuse and flag not in old_use and all_flags:
                                                        flag_str = blue("-" + flag)
                                                elif flag not in old_iuse:
-                                                       flag_str = yellow("-" + flag) + "%"
+                                                       flag_str = yellow("-" + flag)
+                                                       if flag not in iuse_forced:
+                                                               flag_str += "%"
                                                elif flag in old_use:
                                                        flag_str = green("-" + flag) + "*"
                                        if flag_str: