Index: revdep-rebuild
===================================================================
--- revdep-rebuild	(revision 731)
+++ revdep-rebuild	(working copy)
@@ -988,27 +988,22 @@
 	local results=()
 
 	local query_vars=(
-		ROOT
-		PORTAGE_NICENESS
-		EMERGE_DEFAULT_OPTS
-		NOCOLOR
 		SEARCH_DIRS
 		SEARCH_DIRS_MASK
 		LD_LIBRARY_MASK
 	)
 
+	eval $(portageq envvar -v PORTAGE_ROOT PORTAGE_NICENESS EMERGE_DEFAULT_OPTS NOCOLOR)
+	export NOCOLOR
+
 	# one value per line
 	IFS=$'\n'
 	results=( $(unset SEARCH_DIRS; unset SEARCH_DIRS_MASK; unset LD_LIBRARY_MASK; portageq envvar ${query_vars[*]}) )
 	IFS=$OIFS
 
-	PORTAGE_ROOT=${results[0]}
-	PORTAGE_NICENESS=${results[1]}
-	EMERGE_DEFAULT_OPTS=${results[2]}
-	export NOCOLOR=${results[3]}
-	SEARCH_DIRS+=" "${results[4]}
-	SEARCH_DIRS_MASK+=" "${results[5]}
-	LD_LIBRARY_MASK+=" "${results[6]}
+	SEARCH_DIRS+=" "${results[0]}
+	SEARCH_DIRS_MASK+=" "${results[1]}
+	LD_LIBRARY_MASK+=" "${results[2]}
 }
 
 ##