--- icc-7.1.006.ebuild	2003-05-26 10:19:11.000000000 +0900
+++ icc-7.1.006.ebuild	2003-08-23 22:55:38.000000000 +0900
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /home/cvsroot/gentoo-x86/dev-lang/icc/icc-7.1.006.ebuild,v 1.3 2003/05/26 01:19:11 avenj Exp $
 
+inherit rpm
+
 S=${WORKDIR}
 
 DESCRIPTION="Intel C++ Compiler - Intel's Pentium optimized compiler for Linux"
@@ -15,9 +17,7 @@
 LICENSE="icc-7.0"
 
 DEPEND="virtual/linux-sources
-		>=sys-libs/glibc-2.2.5
-		sys-apps/cpio
-		app-arch/rpm"
+		>=sys-libs/glibc-2.2.5"
 
 RDEPEND="virtual/linux-sources
 		>=sys-libs/glibc-2.2.4"
@@ -28,18 +28,15 @@
 
 RESTRICT="nostrip"
 
-src_compile() {
+src_unpack() {
+	unpack "${A}"
+	cd "${S}"
 	# Keep disk space to a minimum
 	rm -f intel-*.ia64.rpm
-
-	mkdir opt
-
-	for x in intel-*.i386.rpm
-	do
-		einfo "Extracting: ${x}"
-		rpm2cpio ${x} | cpio --extract --make-directories --unconditional
-	done
-
+	rpm_unpack intel-*.i386.rpm
+}
+	
+src_compile() {
 	# From UNTAG_CFG_FILES in 'install'
 	SD=${S}/opt/intel # Build DESTINATION
 	RD=/opt/intel # Real DESTINATION
@@ -60,6 +57,10 @@
 		mv $SUPPORTFILE.abs $SUPPORTFILE
 		chmod 644 $SUPPORTFILE
 	done
+
+	# these should not be executable
+	find "${SD}/compiler70/"{docs,man,training,ia32/include} -type f -exec chmod -x "{}" ";"
+	find "${SD}/compiler70/ia32/lib" -name \*.a -exec chmod -x "{}" ";"
 }
 
 src_install () {