--- /usr/portage/dev-lang/icc/icc-9.1.045.ebuild	2007-01-01 15:35:36.000000000 +0000
+++ /usr/portage/dev-lang/icc/icc-9.1.045.ebuild	2007-01-02 16:00:34.000000000 +0000
@@ -46,10 +46,11 @@ 
 			;;
 	esac
 
-	for x in *.rpm
+	for x in ${S}/data/*.rpm
 	do
 		# WORKDIR must be set properly for rpm_unpack()
-		rpm_unpack ${S}/data/${x}
+		einfo "Unpacking: ${x}"
+		rpm_unpack ${x}
 	done
 
 }
@@ -65,7 +66,7 @@ 
 	eval `grep "^[ ]*PACKAGEID=" ${S}/install.sh`
 
 	# From UNTAG_SUPPORT() in 'install.sh'
-	SUPPORTFILE=${S}/opt/intel/cc*/${MMV}*/doc/csupport
+	SUPPORTFILE=${S}/opt/intel/cc/${MMV}/doc/csupport
 	if [ -f ${SUPPORTFILE} ]
 	then
 		einfo "Untagging: ${SUPPORTFILE}"
@@ -75,7 +76,7 @@ 
 	fi
 
 	# From UNTAG_SUPPORT_IDB() in 'install.sh'
-	SUPPORTFILE=${S}/opt/intel/idb*/${MMV}*/doc/idbsupport
+	SUPPORTFILE=${S}/opt/intel/idb/${MMV}/doc/idbsupport
 	if [ -f ${SUPPORTFILE} ]
 	then
 		einfo "Untagging: ${SUPPORTFILE}"