###
### Adds an option for displaying a plus ('+') symbol before activated USE flags to Emerge
###
### See: https://bugs.gentoo.org/show_bug.cgi?id=10013
###

diff -uNr portage-2.1_pre4-r1_(Original)/bin/emerge portage-2.1_pre4-r1/bin/emerge
--- portage-2.1_pre4-r1_(Original)/bin/emerge	2006-01-28 01:49:48.000000000 +0100
+++ portage-2.1_pre4-r1/bin/emerge	2006-01-31 11:09:13.000000000 +0100
@@ -175,6 +175,7 @@
 "--changelog",    "--columns", "--cols",
 "--debug",        "--deep",
 "--digest",
+"--display-plus-symbol-before-activated-use-flags",
 "--emptytree",
 "--fetchonly",    "--fetch-all-uri",
 "--getbinpkg",    "--getbinpkgonly",
@@ -1505,12 +1506,20 @@
 					disabled = []
 				for flag in cur_iuse:
 					if flag in cur_use:
-						if is_new or flag in old_use and all_flags:
-							enabled.append(red(flag))
-						elif flag not in old_iuse:
-							enabled.append(yellow(flag)+"%")
-						elif flag not in old_use:
-							enabled.append(green(flag)+"*")
+						if "--display-plus-symbol-before-activated-use-flags" in myopts:
+							if is_new or flag in old_use and all_flags:
+								enabled.append(red("+"+flag))
+							elif flag not in old_iuse:
+								enabled.append(yellow("+"+flag)+"%")
+							elif flag not in old_use:
+								enabled.append(green("+"+flag)+"*")
+						else:
+							if is_new or flag in old_use and all_flags:
+								enabled.append(red(flag))
+							elif flag not in old_iuse:
+								enabled.append(yellow(flag)+"%")
+							elif flag not in old_use:
+								enabled.append(green(flag)+"*")
 					else:
 						if is_new or flag in old_iuse and flag not in old_use and all_flags:
 							disabled.append(blue("-"+flag))
diff -uNr portage-2.1_pre4-r1_(Original)/man/emerge.1 portage-2.1_pre4-r1/man/emerge.1
--- portage-2.1_pre4-r1_(Original)/man/emerge.1	2006-01-28 01:49:49.000000000 +0100
+++ portage-2.1_pre4-r1/man/emerge.1	2006-01-31 11:12:15.000000000 +0100
@@ -248,6 +248,9 @@
 As an example, this catches updates in libraries that are not directly
 listed in the dependencies of a package.
 .TP
+.BR "\-\-display-plus-symbol-before-activated-use-flags "
+Displays a plus ('+') symbol before activated USE flags, for readability.
+.TP
 .BR "\-\-emptytree " (\fB\-e\fR)
 Reinstalls all world packages and their dependencies to the current USE 
 specifications while differing from the installed set of packages as 
diff -uNr portage-2.1_pre4-r1_(Original)/pym/emergehelp.py portage-2.1_pre4-r1/pym/emergehelp.py
--- portage-2.1_pre4-r1_(Original)/pym/emergehelp.py	2006-01-28 01:49:48.000000000 +0100
+++ portage-2.1_pre4-r1/pym/emergehelp.py	2006-01-31 11:12:37.000000000 +0100
@@ -168,6 +168,10 @@
 		print "              example, this catches updates in libraries that are not directly"
 		print "              listed in the dependencies of a package."
 		print 
+		print "       "+green("--display-plus-symbol-before-activated-use-flags")
+		print "              Displays a plus ('+') symbol before activated USE flags,"
+		print "              for readability."
+		print		
 		print "       "+green("--emptytree")+" ("+green("-e")+" short option)"
 		print "              Virtually tweaks the tree of installed packages to contain"
 		print "              nothing. This is great to use together with --pretend. This makes"