_much_ faster unpacking, see bug 23179

8 files changed, 109 insertions, 83 deletions

diff --git a/dev-lang/icc/ChangeLog b/dev-lang/icc/ChangeLog
index ff68fa780d7e..57f8ac04646a 100644
--- a/dev-lang/icc/ChangeLog
+++ b/dev-lang/icc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/icc
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/ChangeLog,v 1.16 2003/09/18 18:46:13 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/ChangeLog,v 1.17 2003/09/18 19:47:56 avenj Exp $
+
+  18 Sep 2003; Jon Portnoy <avenj@gentoo.org> icc-7.1.006.ebuild,
+  icc-7.1.029.ebuild :
+  _Much_ faster unpacking thanks to rpm.eclass and Georgi Georgiev.
+  See bug 23179 for more information.
 
 *icc-7.1.029 (18 Sep 2003)
 
diff --git a/dev-lang/icc/Manifest b/dev-lang/icc/Manifest
index 68815f1385a9..334a64f8f0c9 100644
--- a/dev-lang/icc/Manifest
+++ b/dev-lang/icc/Manifest
@@ -1,30 +1,29 @@
-MD5 30baafee80540c1e6844fa04182dc017 icc-7.1.029.ebuild 3851
-MD5 0de4f95eca6ff5b42719a6a548b37540 icc-7.1.006.ebuild 3277
+MD5 ac991d9e3afb14829d6edd023a7b4e8f ChangeLog 3534
 MD5 356256656e0df2db03b5f36673f1b0ff icc-6.0-r1.ebuild 3135
-MD5 ba482af3531a84aeaccd6c1e54a842cf icc-7.0.065-r1.ebuild 3230
 MD5 75845f8c8389441c8d7c6f2d80d7ca1b icc-6.0.ebuild 2936
-MD5 4930611a3c1e70a00a308af69a42a4bd ChangeLog 3341
-MD5 8267a3baf3fc2b1813c82c008f61634d icc-7.0.065-r2.ebuild 3230
 MD5 13a5fd0e0298651c759d69aaa769acd7 icc-7.0.065.ebuild 3177
+MD5 ba482af3531a84aeaccd6c1e54a842cf icc-7.0.065-r1.ebuild 3230
+MD5 8267a3baf3fc2b1813c82c008f61634d icc-7.0.065-r2.ebuild 3230
+MD5 dd3824f15dfac8f1468d395ab9ff2449 icc-7.1.006.ebuild 4012
+MD5 c49127eefa0900b32687a5041f333658 icc-7.1.029.ebuild 4008
+MD5 5a2e5b03d1de761f8b08ef35070687be files/digest-icc-7.1.006 65
 MD5 16cb4482e4303fd7d5308782b494463d files/digest-icc-6.0 65
-MD5 c46212d7aef8d7109e315c11305f0869 files/digest-icc-7.0.065-r1 65
-MD5 90412c57cdaf14d472fe7bcc10ac9656 files/digest-icc-7.0.065-r2 643
 MD5 16cb4482e4303fd7d5308782b494463d files/digest-icc-6.0-r1 65
 MD5 c46212d7aef8d7109e315c11305f0869 files/digest-icc-7.0.065 65
-MD5 5a2e5b03d1de761f8b08ef35070687be files/digest-icc-7.1.006 65
+MD5 c46212d7aef8d7109e315c11305f0869 files/digest-icc-7.0.065-r1 65
+MD5 90412c57cdaf14d472fe7bcc10ac9656 files/digest-icc-7.0.065-r2 643
 MD5 f0532a3a488413710b77fe50c5129ffc files/digest-icc-7.1.029 66
+MD5 4e87c3639fd26a60c8d5c2e59893d3f3 files/7.1.006/05icc-ifc-ia32 264
+MD5 5ff26d89e4874fd86fa2a43ac3d593d8 files/7.1.006/05icc-ifc-ia64 264
+MD5 0f9e31cf2e796e982b200b3a04038abd files/7.1.006/icc-ia32 246
 MD5 b10d5f0e2cf2393977007cf31b6d413a files/6.0/05icc 225
+MD5 b10d5f0e2cf2393977007cf31b6d413a files/6.0-r1/05icc-ifc 225
+MD5 d31447eeea859e4cd01119369a0829a0 files/7.0.065/icc 155
+MD5 f498ef092cdd40c2b20d4a80a93d7437 files/7.0.065/05icc-ifc 225
 MD5 0f9e31cf2e796e982b200b3a04038abd files/7.0.065-r1/icc 246
 MD5 f498ef092cdd40c2b20d4a80a93d7437 files/7.0.065-r1/05icc-ifc 225
 MD5 0f9e31cf2e796e982b200b3a04038abd files/7.0.065-r2/icc 246
 MD5 4e87c3639fd26a60c8d5c2e59893d3f3 files/7.0.065-r2/05icc-ifc 264
-MD5 d31447eeea859e4cd01119369a0829a0 files/7.0.065/icc 155
-MD5 f498ef092cdd40c2b20d4a80a93d7437 files/7.0.065/05icc-ifc 225
-MD5 0f9e31cf2e796e982b200b3a04038abd files/7.1.006/icc 246
-MD5 9acbb3c7c7997b1b565af5022e591c1a files/7.1.006/icpc 247
-MD5 4e87c3639fd26a60c8d5c2e59893d3f3 files/7.1.006/05icc-ifc 264
 MD5 4e87c3639fd26a60c8d5c2e59893d3f3 files/7.1.029/05icc-ifc-ia32 264
 MD5 5ff26d89e4874fd86fa2a43ac3d593d8 files/7.1.029/05icc-ifc-ia64 264
 MD5 0f9e31cf2e796e982b200b3a04038abd files/7.1.029/icc-ia32 246
-MD5 9acbb3c7c7997b1b565af5022e591c1a files/7.1.029/icpc-ia32 247
-MD5 b10d5f0e2cf2393977007cf31b6d413a files/6.0-r1/05icc-ifc 225
diff --git a/dev-lang/icc/files/7.1.006/05icc-ifc b/dev-lang/icc/files/7.1.006/05icc-ifc-ia32
index 20c18a04bf99..20c18a04bf99 100644
--- a/dev-lang/icc/files/7.1.006/05icc-ifc
+++ b/dev-lang/icc/files/7.1.006/05icc-ifc-ia32
diff --git a/dev-lang/icc/files/7.1.006/05icc-ifc-ia64 b/dev-lang/icc/files/7.1.006/05icc-ifc-ia64
new file mode 100644
index 000000000000..bd68c1699723
--- /dev/null
+++ b/dev-lang/icc/files/7.1.006/05icc-ifc-ia64
@@ -0,0 +1,7 @@
+IA64ROOT=/opt/intel/compiler70/ia64
+INTEL_FLEXLM_LICENSE=/opt/intel/licenses
+INTEL_LICENSE_FILE=/opt/intel/licenses
+LDPATH=/opt/intel/compiler70/ia64/lib
+MANPATH=/opt/intel/compiler70/man
+PATH=/opt/intel/compiler70/ia64/bin
+ROOTPATH=/opt/intel/compiler70/ia64/bin
diff --git a/dev-lang/icc/files/7.1.006/icc b/dev-lang/icc/files/7.1.006/icc-ia32
index 6d53c6dc0c69..6d53c6dc0c69 100644
--- a/dev-lang/icc/files/7.1.006/icc
+++ b/dev-lang/icc/files/7.1.006/icc-ia32
diff --git a/dev-lang/icc/files/7.1.006/icpc b/dev-lang/icc/files/7.1.006/icpc
deleted file mode 100644
index 9b856398764e..000000000000
--- a/dev-lang/icc/files/7.1.006/icpc
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-export INTEL_LICENSE_FILE="/opt/intel/licenses"
-export LD_LIBRARY_PATH="/opt/intel/compiler70/ia32/lib"
-
-ICCARGS=`echo $* | sed -e s:pentium2:pentiumii:g | sed -e s:pentium3:pentiumiii:g`
-
-/opt/intel/compiler70/ia32/bin/icpcbin $ICCARGS
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."
diff --git a/dev-lang/icc/icc-7.1.029.ebuild b/dev-lang/icc/icc-7.1.029.ebuild
index 88426d7591ad..b563b4e132ed 100644
--- a/dev-lang/icc/icc-7.1.029.ebuild
+++ b/dev-lang/icc/icc-7.1.029.ebuild
@@ -1,13 +1,15 @@
 # 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.029.ebuild,v 1.1 2003/09/18 18:46:13 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/icc-7.1.029.ebuild,v 1.2 2003/09/18 19:47:56 avenj Exp $
+
+inherit rpm
 
 S=${WORKDIR}
 
-DESCRIPTION="Intel C++ Compiler - Intel's Pentium and IA-64 optimizing compiler for Linux"
+DESCRIPTION="Intel C++ Compiler - Intel's Pentium optimized compiler for Linux"
 
-SRC_URI1="ftp://download.intel.com/software/products/compilers/downloads/l_cc_pc_${PV}.tar"
-SRC_URI2="ftp://download.intel.co.jp/software/products/compilers/downloads/l_cc_pc_${PV}.tar"
+SRC_URI1="ftp://download.intel.com/software/products/compilers/downloads/l_cc_p_${PV}.tar"
+SRC_URI2="ftp://download.intel.co.jp/software/products/compilers/downloads/l_cc_p_${PV}.tar"
 SRC_URI="${SRC_URI1} ${SRC_URI2}"
 
 HOMEPAGE="http://www.intel.com/software/products/compilers/clin/"
@@ -15,38 +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
-	app-arch/rpm2targz"
+		>=sys-libs/glibc-2.2.5"
 
 RDEPEND="virtual/linux-sources
-	>=sys-libs/glibc-2.2.5"
+		>=sys-libs/glibc-2.2.5"
 
 SLOT="7"
-KEYWORDS="-* ia64 ~x86"
+KEYWORDS="-* ia64 x86"
 IUSE=""
 
 RESTRICT="nostrip"
 
-src_compile() {
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
 	# Keep disk space to a minimum
-	if [ "$ARCH" = "x86" ]
-	then
-		rm -f intel-*.ia64.rpm
-	else
-		rm -f intel-*.i386.rpm
-	fi
+        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-*.rpm
-	do
-		#this takes longer than rpm2cpio (due to the unnecessary gzipping)
-		#but doesn't require a dependency on the rpm ebuild (which is nice.)
-		einfo "Extracting: ${x}"
-		rpm2targz ${x}
-		rm -f ${x/.rpm/.tar.gz}
-		tar xzvf ${x/.rpm/.tar.gz} || die
-	done
+}
+src_compile() {
 
 	# From UNTAG_CFG_FILES in 'install'
 	SD=${S}/opt/intel # Build DESTINATION
@@ -68,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 () {
@@ -76,24 +78,25 @@ src_install () {
 	cp -a opt ${D}
 
 	insinto /etc/env.d
-	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
+       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 "The ICC compiler for Itanium systems is called \"ecc\"."
-	einfo
 	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."