--- revdep-rebuild.orig	2007-03-12 19:31:20.000000000 -0500
+++ revdep-rebuild	2007-03-12 19:32:19.000000000 -0500
@@ -627,7 +627,7 @@
 			done
 			ln -f $LLIST.4_ebuilds $LLIST.5_order
 		else
-			(EMERGE_DEFAULT_OPTS="" emerge --nospinner --pretend --oneshot --emptytree --quiet $RAW_REBUILD_LIST ; echo $? >$LLIST.5b_status ) | sed -n 's/ //g;s/^.*\]//p' | grep "$REBUILD_GREP" >$LLIST.5_order
+			(EMERGE_DEFAULT_OPTS="" emerge --nospinner --pretend --oneshot --emptytree --quiet $RAW_REBUILD_LIST ; echo $? >$LLIST.5b_status ) | sed -n 's/  *$//;s/^\[.*\] //p' | awk '{print $1}' | grep "$REBUILD_GREP" >$LLIST.5_order
 			if [ $(cat $LLIST.5b_status) -gt 0 ] ; then
 				echo ""
 				echo -e "${RD}Warning: Failed to resolve package order."