ia64 support, new version, marked ~x86 too

7 files changed, 156 insertions, 4 deletions

diff --git a/dev-lang/icc/ChangeLog b/dev-lang/icc/ChangeLog
index ce21114786c7..ff68fa780d7e 100644
--- a/dev-lang/icc/ChangeLog
+++ b/dev-lang/icc/ChangeLog
@@ -1,6 +1,13 @@
 # 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.15 2003/05/26 01:19:11 avenj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/ChangeLog,v 1.16 2003/09/18 18:46:13 drobbins Exp $
+
+*icc-7.1.029 (18 Sep 2003)
+
+  18 Sep 2003; Daniel Robbins <drobbins@gentoo.org> icc-7.1.029.ebuild:
+  new version marked stable for ia64, unstable for x86. ia64 support
+  integrated into this ebuild. Also switched to slower rpm2targz simply
+  because it doesn't require "rpm" to be merged.
 
 *icc-7.1.006 (11 April 2003)
 
diff --git a/dev-lang/icc/Manifest b/dev-lang/icc/Manifest
index f29afc83140c..68815f1385a9 100644
--- a/dev-lang/icc/Manifest
+++ b/dev-lang/icc/Manifest
@@ -1,9 +1,9 @@
-MD5 91dc9b25435c291e2c497683cd40c147 icc-7.1.029.ebuild 3607
+MD5 30baafee80540c1e6844fa04182dc017 icc-7.1.029.ebuild 3851
 MD5 0de4f95eca6ff5b42719a6a548b37540 icc-7.1.006.ebuild 3277
 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 61a9dc64f1c5745519ab706102422f3f ChangeLog 3047
+MD5 4930611a3c1e70a00a308af69a42a4bd ChangeLog 3341
 MD5 8267a3baf3fc2b1813c82c008f61634d icc-7.0.065-r2.ebuild 3230
 MD5 13a5fd0e0298651c759d69aaa769acd7 icc-7.0.065.ebuild 3177
 MD5 16cb4482e4303fd7d5308782b494463d files/digest-icc-6.0 65
@@ -23,7 +23,6 @@ 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 0f9e31cf2e796e982b200b3a04038abd files/7.1.029/icc 246
 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
diff --git a/dev-lang/icc/files/7.1.029/05icc-ifc-ia32 b/dev-lang/icc/files/7.1.029/05icc-ifc-ia32
new file mode 100644
index 000000000000..20c18a04bf99
--- /dev/null
+++ b/dev-lang/icc/files/7.1.029/05icc-ifc-ia32
@@ -0,0 +1,7 @@
+IA32ROOT=/opt/intel/compiler70/ia32
+INTEL_FLEXLM_LICENSE=/opt/intel/licenses
+INTEL_LICENSE_FILE=/opt/intel/licenses
+LDPATH=/opt/intel/compiler70/ia32/lib
+MANPATH=/opt/intel/compiler70/man
+PATH=/opt/intel/compiler70/ia32/bin
+ROOTPATH=/opt/intel/compiler70/ia32/bin
diff --git a/dev-lang/icc/files/7.1.029/05icc-ifc-ia64 b/dev-lang/icc/files/7.1.029/05icc-ifc-ia64
new file mode 100644
index 000000000000..bd68c1699723
--- /dev/null
+++ b/dev-lang/icc/files/7.1.029/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.029/icc-ia32 b/dev-lang/icc/files/7.1.029/icc-ia32
new file mode 100644
index 000000000000..6d53c6dc0c69
--- /dev/null
+++ b/dev-lang/icc/files/7.1.029/icc-ia32
@@ -0,0 +1,7 @@
+#!/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/iccbin $ICCARGS
diff --git a/dev-lang/icc/files/digest-icc-7.1.029 b/dev-lang/icc/files/digest-icc-7.1.029
new file mode 100644
index 000000000000..54e45bb10142
--- /dev/null
+++ b/dev-lang/icc/files/digest-icc-7.1.029
@@ -0,0 +1 @@
+MD5 6449cce3173fb91273a224be34353b5b l_cc_pc_7.1.029.tar 75991040
diff --git a/dev-lang/icc/icc-7.1.029.ebuild b/dev-lang/icc/icc-7.1.029.ebuild
new file mode 100644
index 000000000000..88426d7591ad
--- /dev/null
+++ b/dev-lang/icc/icc-7.1.029.ebuild
@@ -0,0 +1,124 @@
+# 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 $
+
+S=${WORKDIR}
+
+DESCRIPTION="Intel C++ Compiler - Intel's Pentium and IA-64 optimizing 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_URI="${SRC_URI1} ${SRC_URI2}"
+
+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"
+
+RDEPEND="virtual/linux-sources
+	>=sys-libs/glibc-2.2.5"
+
+SLOT="7"
+KEYWORDS="-* ia64 ~x86"
+IUSE=""
+
+RESTRICT="nostrip"
+
+src_compile() {
+	# Keep disk space to a minimum
+	if [ "$ARCH" = "x86" ]
+	then
+		rm -f intel-*.ia64.rpm
+	else
+		rm -f intel-*.i386.rpm
+	fi
+
+	mkdir opt
+
+	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
+
+	# From UNTAG_CFG_FILES in 'install'
+	SD=${S}/opt/intel # Build DESTINATION
+	RD=/opt/intel # Real DESTINATION
+	for FILE in $(find $SD/compiler*/ia??/bin/ -regex '.*[ei][cf]p?c$\|.*cfg$\|.*pcl$\|.*vars[^/]*.c?sh$' 2>/dev/null)
+	do
+		sed s@\<INSTALLDIR\>@$RD@g ${FILE} > ${FILE}.abs
+		mv -f ${FILE}.abs ${FILE}
+		chmod 755 ${FILE}
+	done
+
+	# From UNTAG_SUPPORT in 'install'
+	eval `grep "^[ ]*COMBOPACKAGEID=" install`
+
+	for SUPPORTFILE in ${SD}/compiler*/docs/*support
+	do
+		einfo "Untagging: ${SUPPORTFILE}"
+		sed s@\<INSTALLTIMECOMBOPACKAGEID\>@$COMBOPACKAGEID@g $SUPPORTFILE > $SUPPORTFILE.abs
+		mv $SUPPORTFILE.abs $SUPPORTFILE
+		chmod 644 $SUPPORTFILE
+	done
+}
+
+src_install () {
+	dodoc lgpltext
+	dodoc clicense
+	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
+}
+
+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."
+	einfo "You cannot run icc without this license file."
+	einfo "Read the website for more information on this license."
+	einfo
+	einfo "Documentation can be found in /opt/intel/compiler70/docs/"
+	einfo
+	einfo "You will need to place your license in /opt/intel/licenses/"
+	einfo
+
+	ewarn
+	ewarn "Packages compiled with versions of icc older than 7.0 will need"
+	ewarn "to be recompiled. Until you do that, old packages will"
+	ewarn "work if you edit /etc/ld.so.conf and change 'compiler70'"
+	ewarn "to 'compiler60' and run 'ldconfig.' Note that this edit"
+	ewarn "won't persist and will require you to re-edit after each"
+	ewarn "package you re-install."
+	ewarn "BEFORE COMPILING IMPORTANT APPLICATIONS THAT YOUR"
+	ewarn "SYSTEM DEPENDS ON, READ THE WARNING ABOVE."
+	ewarn "THIS COULD RENDER YOUR SYSTEM UNUSABLE."
+	ewarn "THIS IS A PROBLEM WITH INTEL'S SOFTWARE, _NOT_"
+	ewarn "WITH GENTOO."
+
+	ewarn "If 'icc' breaks, use 'iccbin' instead and report a bug."
+	ewarn "Please use 'source /etc/profile' prior to merging any icc-enabled"
+	ewarn "ebuilds."
+}