--- eutils.eclass.orig	2011-06-25 23:18:02.764338513 -0500
+++ eutils.eclass	2011-06-25 23:50:55.636053704 -0500
@@ -1527,13 +1527,16 @@
 			fi
 		done
 		export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
-		einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
 		export CDROM_SET=-1
 		for f in ${CDROM_CHECK_1//:/ } ; do
 			((++CDROM_SET))
-			[[ -e ${CDROM_ROOT}/${f} ]] && break
+			if [[ -e ${CDROM_ROOT}/${f} ]]; then
+				einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
+				export CDROM_MATCH=${f}
+				return
+			fi
 		done
-		export CDROM_MATCH=${f}
+		CDROM_SET=-1
 		return
 	fi