_much_ faster unpacking, see bug 23179

1 files changed, 40 insertions, 21 deletions

diff --git a/dev-lang/icc/icc-7.1.006.ebuild b/dev-lang/icc/icc-7.1.006.ebuild
index 7c0200603475..006f52ac718a 100644
--- a/dev-lang/icc/icc-7.1.006.ebuild
+++ b/dev-lang/icc/icc-7.1.006.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/icc-7.1.006.ebuild,v 1.3 2003/05/26 01:19:11 avenj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/icc-7.1.006.ebuild,v 1.4 2003/09/18 19:47:56 avenj Exp $
+
+inherit rpm
 
 S=${WORKDIR}
 
@@ -15,30 +17,33 @@ HOMEPAGE="http://www.intel.com/software/products/compilers/clin/"
 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"
+		>=sys-libs/glibc-2.2.5"
 
 SLOT="7"
-KEYWORDS="-* x86"
+KEYWORDS="-* ia64 x86"
 IUSE=""
 
 RESTRICT="nostrip"
 
-src_compile() {
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
 	# Keep disk space to a minimum
-	rm -f intel-*.ia64.rpm
+        if [ "$ARCH" = "x86" ]
+        then
+               rm -f intel-*.ia64.rpm
+        else
+               rm -f intel-*.i386.rpm
+        fi
 
-	mkdir opt
+        rpm_unpack *.rpm
 
-	for x in intel-*.i386.rpm
-	do
-		einfo "Extracting: ${x}"
-		rpm2cpio ${x} | cpio --extract --make-directories --unconditional
-	done
+}
+src_compile() {
 
 	# From UNTAG_CFG_FILES in 'install'
 	SD=${S}/opt/intel # Build DESTINATION
@@ -60,6 +65,11 @@ src_compile() {
 		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 () {
@@ -67,17 +77,26 @@ src_install () {
 	dodoc clicense
 	cp -a opt ${D}
 
-	# icc enviroment
 	insinto /etc/env.d
-	doins ${FILESDIR}/${PVR}/05icc-ifc
-	# fix the issue with the primary icc executable
-	exeinto /opt/intel/compiler70/ia32/bin
-	doexe ${FILESDIR}/${PVR}/icc
-	doexe ${FILESDIR}/${PVR}/icpc
+       if [ "$ARCH" = "x86" ]
+       then
+               newins ${FILESDIR}/${PVR}/05icc-ifc-ia32 05icc-ifc || die
+               # fix the processor name issue with the primary icc executable
+               exeinto /opt/intel/compiler70/ia32/bin
+               newexe ${FILESDIR}/${PVR}/icc-ia32 icc
+               newexe ${FILESDIR}/${PVR}/icpc-ia32 icc
+       else
+               newins ${FILESDIR}/${PVR}/05icc-ifc-ia64 05icc-ifc || die
+               dodir /usr/bin
+               dosym ../../opt/intel/compiler70/ia64/bin/eccbin /usr/bin/ecc
+               dosym ../../opt/intel/compiler70/ia64/bin/ecpcbin /usr/bin/ecpc
+       fi
+
+
 }
 
 pkg_postinst () {
-	einfo
+	einfo "The ICC compiler for Itanium systems is called \"ecc\"."
 	einfo "http://www.intel.com/software/products/compilers/clin/noncom.htm"
 	einfo "From the above url you can get a free, non-commercial"
 	einfo "license to use the Intel C++ Compiler emailed to you."