--- revdep-rebuild.orig	2007-07-19 13:08:42.000000000 -0400
+++ revdep-rebuild	2007-07-19 13:08:58.000000000 -0400
@@ -208,7 +208,6 @@
 			avoid_utils="$1"
 			;;
 		-nc|-C|--no-color|--nocolor)
-			# TODO: Does this variable do anything now that the main color functions are removed?
 			export NOCOLOR=1
 			;;
 		-l|-np|--no-ld-path)
@@ -248,8 +247,10 @@
 				sed 's:/var/db/pkg/\(.*\)/CONTENTS:\1:'
 		}
 	fi
+	# Normalize some EMERGE_OPTIONS
 	EMERGE_OPTIONS=(${EMERGE_OPTIONS[@]/%-p/--pretend})
 	EMERGE_OPTIONS=(${EMERGE_OPTIONS[@]/%-f/--fetchonly})
+	EMERGE_OPTIONS=(${EMERGE_OPTIONS[@]/%-f/--verbose})
 	if [[ ${EMERGE_OPTIONS[@]} != *--pretend* && $UID -ne 0 ]]; then
 		ewarn "You are not superuser. Adding --pretend to emerge options."
 		EMERGE_OPTIONS+=(--pretend)
@@ -315,7 +316,7 @@
 LD_LIBRARY_MASK=$(clean_var "$LD_LIBRARY_MASK")
 
 # Use the color preference from portage
-NOCOLOR=$(portageq envvar NOCOLOR)
+export NOCOLOR=$(portageq envvar NOCOLOR)
 
 set_trap() {
 	trap "rm_temp $1" SIGHUP SIGINT SIGQUIT SIGABRT SIGTERM
@@ -374,6 +375,7 @@
 		# We don't care if these emerge options change
 		EMERGE_OPTIONS=(${EMERGE_OPTIONS[@]//--pretend/})
 		EMERGE_OPTIONS=(${EMERGE_OPTIONS[@]//--fetchonly/})
+		EMERGE_OPTIONS=(${EMERGE_OPTIONS[@]//--verbose/})
 		cat <<- EOF
 			SEARCH_DIRS="$SEARCH_DIRS"
 			SEARCH_DIRS_MASK="$SEARCH_DIRS_MASK"