Bump to latest noncommercial version. Attempt to remove most hardcoded versions from ebuild, although some still exist in filesdir.

(Portage version: 2.1.1_rc1)

6 files changed, 169 insertions, 1 deletions

diff --git a/dev-lang/icc/ChangeLog b/dev-lang/icc/ChangeLog
index 6a158f0b10ad..5eb4b0bde7d2 100644
--- a/dev-lang/icc/ChangeLog
+++ b/dev-lang/icc/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-lang/icc
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/ChangeLog,v 1.32 2006/06/05 18:04:10 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/ChangeLog,v 1.33 2006/08/28 09:14:45 dberkholz Exp $
+
+*icc-9.1.042 (28 Aug 2006)
+
+  28 Aug 2006; Donnie Berkholz <dberkholz@gentoo.org>;
+  +files/9.1.042/05icc-ifc, +files/9.1.042/icc, +files/9.1.042/icpc,
+  +icc-9.1.042.ebuild:
+  Bump to latest noncommercial version. Attempt to remove most hardcoded
+  versions from ebuild, although some still exist in filesdir.
 
 *icc-9.0.030 (05 Jun 2006)
 
diff --git a/dev-lang/icc/files/9.1.042/05icc-ifc b/dev-lang/icc/files/9.1.042/05icc-ifc
new file mode 100644
index 000000000000..838b25165f4e
--- /dev/null
+++ b/dev-lang/icc/files/9.1.042/05icc-ifc
@@ -0,0 +1,7 @@
+IA32ROOT=/opt/intel/compiler91
+INTEL_FLEXLM_LICENSE=/opt/intel/compiler91/licenses
+LDPATH=/opt/intel/compiler91/lib
+MANPATH=/opt/intel/compiler91/man
+PATH=/opt/intel/compiler91/bin
+ROOTPATH=/opt/intel/compiler91/bin
+
diff --git a/dev-lang/icc/files/9.1.042/icc b/dev-lang/icc/files/9.1.042/icc
new file mode 100644
index 000000000000..c9cfd8d38086
--- /dev/null
+++ b/dev-lang/icc/files/9.1.042/icc
@@ -0,0 +1,10 @@
+#! /bin/sh
+#
+# Gentoo-specific wrapper script for the Intel C/C++ compilers
+#
+# Maintainer: Karl Trygve Kalleberg <karltk@gentoo.org>
+#
+
+export INTEL_LICENSE_FILE="/opt/intel/compiler91/licenses"
+export LD_LIBRARY_PATH="/opt/intel/compiler91/lib"
+/opt/intel/compiler91/bin/iccbin $*
diff --git a/dev-lang/icc/files/9.1.042/icpc b/dev-lang/icc/files/9.1.042/icpc
new file mode 100644
index 000000000000..728e244c585d
--- /dev/null
+++ b/dev-lang/icc/files/9.1.042/icpc
@@ -0,0 +1,10 @@
+#! /bin/sh
+#
+# Gentoo-specific wrapper script for Intel C/C++ compiler suite
+#
+# Maintainer: Karl Trygve Kalleberg <karltk@gentoo.org>
+#
+
+export INTEL_LICENSE_FILE="/opt/intel/compiler91/licenses"
+export LD_LIBRARY_PATH="/opt/intel/compiler91/lib"
+/opt/intel/compiler91/bin/icpcbin $*
diff --git a/dev-lang/icc/files/digest-icc-9.1.042 b/dev-lang/icc/files/digest-icc-9.1.042
new file mode 100644
index 000000000000..104423e56ba1
--- /dev/null
+++ b/dev-lang/icc/files/digest-icc-9.1.042
@@ -0,0 +1,3 @@
+MD5 21a2abf2987bc4ab2eb8a9f54ed35d22 l_cc_c_9.1.042.tar.gz 292001591
+RMD160 06b7cba02eb8eb6489cab572d9dd9480076ee653 l_cc_c_9.1.042.tar.gz 292001591
+SHA256 1552c124227a460746bf24f9159bdfb3d3974d0069d415a2ae20d6d9dc20b8ed l_cc_c_9.1.042.tar.gz 292001591
diff --git a/dev-lang/icc/icc-9.1.042.ebuild b/dev-lang/icc/icc-9.1.042.ebuild
new file mode 100644
index 000000000000..1eaf5f7c82f8
--- /dev/null
+++ b/dev-lang/icc/icc-9.1.042.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/icc-9.1.042.ebuild,v 1.1 2006/08/28 09:14:45 dberkholz Exp $
+
+inherit rpm versionator
+
+MAJOR=$(get_major_version ${PV})
+MINOR=$(get_version_component_range 2 ${PV})
+
+DESCRIPTION="Intel C++ Compiler - Intel's Pentium optimized compiler for Linux"
+SRC_URI="l_cc_c_${PV}.tar.gz"
+HOMEPAGE="http://www.intel.com/software/products/compilers/clin/"
+LICENSE="icc-9.0"
+RDEPEND=">=sys-libs/glibc-2.2.5"
+SLOT="${MAJOR}.${MINOR}"
+MMV="${MAJOR}.${MINOR}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RESTRICT="nostrip fetch"
+S="${WORKDIR}/l_cc_c_${PV}"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S} || die
+
+	# The tarball contains rpms for multiple arches, and a lot of
+	# auxiliary rpms common across arches. We must throw away 
+	# the arch we're not.
+	case ${ARCH} in
+		amd64)
+			rm -f data/intel-*.{i386,ia64}.rpm
+			;;
+		ia64)
+			rm -f data/intel-*.{em64t,i386}.rpm
+			;;
+		x86)
+			rm -f data/intel-*.{em64t,ia64}.rpm
+			;;
+	esac
+
+	for x in *.rpm
+	do
+		# WORKDIR must be set properly for rpm_unpack()
+		rpm_unpack ${S}/data/${x}
+	done
+
+}
+
+src_compile() {
+	instdir=/opt/intel/compiler${MMV//.}
+
+	for x in opt/intel/*/*/bin/* ; do
+		sed "s|<INSTALLDIR>|${instdir}|g" -i $x
+	done
+
+	# == SRC_BASE
+	eval `grep "^[ ]*PACKAGEID=" ${S}/install.sh`
+
+	# From UNTAG_SUPPORT() in 'install.sh'
+	SUPPORTFILE=${S}/opt/intel/cc*/${MMV}*/doc/csupport
+	if [ -f ${SUPPORTFILE} ]
+	then
+		einfo "Untagging: ${SUPPORTFILE}"
+		sed s@\<installpackageid\>@${PACKAGEID}@g ${SUPPORTFILE} > ${SUPPORTFILE}.abs
+		mv ${SUPPORTFILE}.abs ${SUPPORTFILE}
+		chmod 644 ${SUPPORTFILE}
+	fi
+
+	# From UNTAG_SUPPORT_IDB() in 'install.sh'
+	SUPPORTFILE=${S}/opt/intel/idb*/${MMV}*/doc/idbsupport
+	if [ -f ${SUPPORTFILE} ]
+	then
+		einfo "Untagging: ${SUPPORTFILE}"
+		sed s@\<INSTALLTIMECOMBOPACKAGEID\>@${PACKAGEID}@g ${SUPPORTFILE} > ${SUPPORTFILE}.abs
+		mv ${SUPPORTFILE}.abs ${SUPPORTFILE}
+		chmod 644 ${SUPPORTFILE}
+	fi
+
+	# These should not be executable
+	find "${S}"/opt/intel/cc*/${MMV}*/{doc,man,include} -type f -exec chmod -x "{}" ";"
+	find "${S}"/opt/intel/cc*/${MMV}*/lib -name \*.a -exec chmod -x "{}" ";"
+	find "${S}"/opt/intel/idb*/${MMV}*/{doc,man} -type f -exec chmod -x "{}" ";"
+}
+
+src_install () {
+	instdir=/opt/intel/compiler${MMV//.}
+	dodoc ${S}/licenses/lgpltext
+	dodoc ${S}/clicense
+	dodir ${instdir}
+	cp -pPR opt/intel/cc*/${MMV}*/* ${D}/${instdir}
+	cp -pPR opt/intel/idb*/${MMV}*/* ${D}/${instdir}
+	insinto /etc/env.d
+	doins ${FILESDIR}/${PVR}/05icc-ifc || die
+	exeinto ${instdir}/bin
+	doexe ${FILESDIR}/${PVR}/icc || die
+	doexe ${FILESDIR}/${PVR}/icpc || die
+}
+
+pkg_postinst () {
+	instdir=/opt/intel/compiler${MMV//.}
+
+	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 ${instdir}/doc/"
+	einfo
+	einfo "You will need to place your license in ${instdir}/licenses/"
+	einfo
+
+	ewarn
+	ewarn "Packages compiled with versions of icc older than 8.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 '${instdir}'"
+	ewarn "to '/opt/intel/compiler70' 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."
+}