--- quse.c.old	2006-11-23 00:47:15.040578639 +0100
+++ quse.c	2006-11-23 00:44:37.352550863 +0100
@@ -103,7 +103,7 @@ int quse_describe_flag(int ind, short re
 		for (i = 0; i < NUM_SEARCH_FILES; ++i) {
 			snprintf(buf, sizeof(buf), "%s/profiles/%s", cur_overlay->path, search_files[i]);
 			if ((fp[i] = fopen(buf, "r")) == NULL)
-				if (verbose )
+				if (verbose>2)
 					warnp("skipping %s for the %s overlay", search_files[i], cur_overlay->name);
 		}
 
@@ -192,7 +192,7 @@ skip_file:
 			continue;
 		snprintf(buf, sizeof(buf), "%s/profiles/desc/", cur_overlay->path);
 		if (!(d = opendir(buf))) {
-			if (verbose)
+			if (verbose>2)
 				warn("Could not open %s -> skipping", buf);
 			continue;
 		}
@@ -305,7 +305,7 @@ int quse_main(int argc, char **argv)
 	if (idx == -1)
 		return quse_describe_flag(optind, repo, repo_search, argc, argv);
 
-	if (quse_all) optind = argc;
+	/* if (quse_all) optind = argc; */
 	initialize_ebuild_flat();	/* sets our pwd to $PORTDIR */
 
 	search_len = strlen(search_vars[idx]);
@@ -352,6 +352,14 @@ int quse_main(int argc, char **argv)
 			continue;
 		}
 
+		if ((quse_all) && optind!=argc) {
+			for (i=optind;i<argc;i++)
+				if ((strstr(ebuild,argv[i])))
+					break;
+			if (i==argc)
+				continue;
+		}
+
 		if ((p = strchr(ebuild, '\n')) != NULL)
 			*p = 0;
 		if ((newfp = fopen(ebuild, "r")) != NULL) {
@@ -478,6 +486,8 @@ int quse_main(int argc, char **argv)
 						printf("%s %s %s ", *user ? user : "MISSING", *revision ? revision : "MISSING", *date ? date : "MISSING");
 
 					printf("%s%s::%s%s ", CYAN, cur_overlay->name, ebuild, NORM);
+					if (quse_all)
+						print_highlighted_use_flags(&buf0[search_len+1], argc, argc, argv);
+					else
+						print_highlighted_use_flags(&buf0[search_len+1], optind, argc, argv);
 					print_highlighted_use_flags(&buf0[search_len+1], optind, argc, argv);
 					puts(NORM);
 					if (verbose > 1) {
@@ -485,7 +495,7 @@ int quse_main(int argc, char **argv)
 						int ARGC = 0;
 						makeargv(&buf0[search_len+1], &ARGC, &ARGV);
 						if (ARGC > 0) {
-							quse_describe_flag(1, repo, repo_search, ARGC, ARGV);
+							quse_describe_flag(1, 0, repo_search, ARGC, ARGV);
 							for (i = 0; i < ARGC; i++)
 								free(ARGV[i]);
 							free(ARGV);