New upstream release.

(Portage version: 2.0.51.19)

12 files changed, 236 insertions, 53 deletions

diff --git a/dev-lang/icc/ChangeLog b/dev-lang/icc/ChangeLog
index 11c10ee6859c..829615104f3f 100644
--- a/dev-lang/icc/ChangeLog
+++ b/dev-lang/icc/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-lang/icc
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/ChangeLog,v 1.24 2005/05/26 22:39:47 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/ChangeLog,v 1.25 2005/05/31 19:17:51 karltk Exp $
+
+*icc-8.1.032 (31 May 2005)
+
+  31 May 2005; Karl Trygve Kalleberg <karltk@gentoo.org>
+  files/8.1.030/05icc-ifc, files/8.1.030/icpc, files/8.1.030/icc,
+  +files/8.1.032/05icc-ifc, +files/8.1.032/icc, +files/8.1.032/iccifc.conf,
+  +files/8.1.032/icpc, icc-8.1.030.ebuild, +icc-8.1.032.ebuild:
+  New upstream release. Minor path modifications to script files and 
+  old 8.1.x ebuilds: 8.1 now lives in /opt/intel/compiler81
 
 *icc-8.1.030 (26 May 2005)
 
diff --git a/dev-lang/icc/Manifest b/dev-lang/icc/Manifest
index b9ddc321bf54..0f4f70bff022 100644
--- a/dev-lang/icc/Manifest
+++ b/dev-lang/icc/Manifest
@@ -1,36 +1,27 @@
-MD5 555df8ca9389954a8d4b5c7c506484c3 icc-6.0.ebuild 2938
-MD5 e5f080f4789ca82a2ac425df46fc95b7 metadata.xml 304
-MD5 8871404a6426584a91fe924946735a62 icc-7.0.065.ebuild 3171
-MD5 91f94a1c311af7f9100b209c4ac42524 icc-7.1.006.ebuild 3759
+MD5 7ecf2296db1fec6002167a88658d7b36 icc-8.1.030.ebuild 3787
 MD5 f6a6116fc30211d3e17203d5f12cbd9e icc-8.0.055.ebuild 4142
-MD5 c3da1109f83039b1dc6f16e9ad332a34 icc-7.0.065-r2.ebuild 3224
-MD5 6e8373ac7f5b6df4a51512d4f80228fc icc-8.1.030.ebuild 3868
 MD5 144efaddc7758ec6e3ce85f05a97764f icc-7.1.029.ebuild 3817
-MD5 c8808dfaf846707d71518a3474d894b6 ChangeLog 5008
-MD5 cd7089aefd6e3109e3a1068c51a53087 icc-7.1.030.ebuild 3953
+MD5 91f94a1c311af7f9100b209c4ac42524 icc-7.1.006.ebuild 3759
 MD5 1b8f52c5f87649ed9d30eacfcc773102 icc-6.0-r1.ebuild 3138
 MD5 2dafaea542266611f6216a992c6be2ee icc-7.0.065-r1.ebuild 3224
-MD5 c46212d7aef8d7109e315c11305f0869 files/digest-icc-7.0.065 65
-MD5 f0532a3a488413710b77fe50c5129ffc files/digest-icc-7.1.029 66
-MD5 c46212d7aef8d7109e315c11305f0869 files/digest-icc-7.0.065-r1 65
-MD5 6163449bc5b6528112995c347c4de85a files/digest-icc-7.1.030 66
+MD5 7ecf2296db1fec6002167a88658d7b36 icc-8.1.032.ebuild 3787
+MD5 cd7089aefd6e3109e3a1068c51a53087 icc-7.1.030.ebuild 3953
+MD5 555df8ca9389954a8d4b5c7c506484c3 icc-6.0.ebuild 2938
+MD5 c8808dfaf846707d71518a3474d894b6 ChangeLog 5008
+MD5 e5f080f4789ca82a2ac425df46fc95b7 metadata.xml 304
+MD5 c3da1109f83039b1dc6f16e9ad332a34 icc-7.0.065-r2.ebuild 3224
+MD5 8871404a6426584a91fe924946735a62 icc-7.0.065.ebuild 3171
+MD5 16cb4482e4303fd7d5308782b494463d files/digest-icc-6.0 65
 MD5 451c1e8d20f20a97589c32edecbb422c files/digest-icc-8.0.055 68
 MD5 f95d94ed19cd410e3b5cde9a5d911f2f files/digest-icc-8.1.030 70
+MD5 7845f60233e2c235b054efe83b6b2b86 files/digest-icc-8.1.032 70
+MD5 c46212d7aef8d7109e315c11305f0869 files/digest-icc-7.0.065-r1 65
+MD5 c46212d7aef8d7109e315c11305f0869 files/digest-icc-7.0.065-r2 65
 MD5 16cb4482e4303fd7d5308782b494463d files/digest-icc-6.0-r1 65
-MD5 16cb4482e4303fd7d5308782b494463d files/digest-icc-6.0 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-r2 65
-MD5 0fff0e3906e80a6f3211ddd1c2dfb226 files/8.1.030/icc 156
-MD5 389113e875524af9b87e4073226bd00e files/8.1.030/iccifc.conf 868
-MD5 69a2a9441333847a134d54a062401a6c files/8.1.030/icpc 157
-MD5 6c420a8540b22f20a7d5799519ef1b7f files/8.1.030/05icc-ifc 216
-MD5 0fff0e3906e80a6f3211ddd1c2dfb226 files/8.0.055/icc 156
-MD5 389113e875524af9b87e4073226bd00e files/8.0.055/iccifc.conf 868
-MD5 69a2a9441333847a134d54a062401a6c files/8.0.055/icpc 157
-MD5 6c420a8540b22f20a7d5799519ef1b7f files/8.0.055/05icc-ifc 216
-MD5 4e87c3639fd26a60c8d5c2e59893d3f3 files/7.1.029/05icc-ifc-ia32 264
-MD5 0f9e31cf2e796e982b200b3a04038abd files/7.1.029/icc-ia32 246
-MD5 5ff26d89e4874fd86fa2a43ac3d593d8 files/7.1.029/05icc-ifc-ia64 264
+MD5 f0532a3a488413710b77fe50c5129ffc files/digest-icc-7.1.029 66
+MD5 6163449bc5b6528112995c347c4de85a files/digest-icc-7.1.030 66
 MD5 b10d5f0e2cf2393977007cf31b6d413a files/6.0/05icc 225
 MD5 0f9e31cf2e796e982b200b3a04038abd files/7.0.065-r1/icc 246
 MD5 f498ef092cdd40c2b20d4a80a93d7437 files/7.0.065-r1/05icc-ifc 225
@@ -39,6 +30,21 @@ 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 4e87c3639fd26a60c8d5c2e59893d3f3 files/7.1.006/05icc-ifc-ia32 264
-MD5 0f9e31cf2e796e982b200b3a04038abd files/7.1.006/icc-ia32 246
 MD5 5ff26d89e4874fd86fa2a43ac3d593d8 files/7.1.006/05icc-ifc-ia64 264
+MD5 0f9e31cf2e796e982b200b3a04038abd files/7.1.006/icc-ia32 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
 MD5 b10d5f0e2cf2393977007cf31b6d413a files/6.0-r1/05icc-ifc 225
+MD5 0fff0e3906e80a6f3211ddd1c2dfb226 files/8.0.055/icc 156
+MD5 69a2a9441333847a134d54a062401a6c files/8.0.055/icpc 157
+MD5 389113e875524af9b87e4073226bd00e files/8.0.055/iccifc.conf 868
+MD5 6c420a8540b22f20a7d5799519ef1b7f files/8.0.055/05icc-ifc 216
+MD5 3e5f45926e3d03276c9b547b1fd29660 files/8.1.030/icc 156
+MD5 c7d2081ea80924fc6d5d2cefac999244 files/8.1.030/icpc 157
+MD5 389113e875524af9b87e4073226bd00e files/8.1.030/iccifc.conf 868
+MD5 a075d6c1511757aa0fdd46a9c5f8c2ed files/8.1.030/05icc-ifc 216
+MD5 3e5f45926e3d03276c9b547b1fd29660 files/8.1.032/icc 156
+MD5 c7d2081ea80924fc6d5d2cefac999244 files/8.1.032/icpc 157
+MD5 389113e875524af9b87e4073226bd00e files/8.1.032/iccifc.conf 868
+MD5 a075d6c1511757aa0fdd46a9c5f8c2ed files/8.1.032/05icc-ifc 216
diff --git a/dev-lang/icc/files/8.1.030/05icc-ifc b/dev-lang/icc/files/8.1.030/05icc-ifc
index e94ef175cd30..7bb8a469943f 100644
--- a/dev-lang/icc/files/8.1.030/05icc-ifc
+++ b/dev-lang/icc/files/8.1.030/05icc-ifc
@@ -1,6 +1,6 @@
-IA32ROOT=/opt/intel/compiler80
-INTEL_FLEXLM_LICENSE=/opt/intel/compiler80/licenses
-LDPATH=/opt/intel/compiler80/lib
-MANPATH=/opt/intel/compiler80/man
-PATH=/opt/intel/compiler80/bin
-ROOTPATH=/opt/intel/compiler80/bin
+IA32ROOT=/opt/intel/compiler81
+INTEL_FLEXLM_LICENSE=/opt/intel/compiler81/licenses
+LDPATH=/opt/intel/compiler81/lib
+MANPATH=/opt/intel/compiler81/man
+PATH=/opt/intel/compiler81/bin
+ROOTPATH=/opt/intel/compiler81/bin
diff --git a/dev-lang/icc/files/8.1.030/icc b/dev-lang/icc/files/8.1.030/icc
index e2d151a20d00..3ea13353c745 100644
--- a/dev-lang/icc/files/8.1.030/icc
+++ b/dev-lang/icc/files/8.1.030/icc
@@ -1,4 +1,4 @@
 #!/bin/sh
-export INTEL_LICENSE_FILE="/opt/intel/compiler80/licenses"
-export LD_LIBRARY_PATH="/opt/intel/compiler80/lib"
-/opt/intel/compiler80/bin/iccbin $*
+export INTEL_LICENSE_FILE="/opt/intel/compiler81/licenses"
+export LD_LIBRARY_PATH="/opt/intel/compiler81/lib"
+/opt/intel/compiler81/bin/iccbin $*
diff --git a/dev-lang/icc/files/8.1.030/icpc b/dev-lang/icc/files/8.1.030/icpc
index 7626ee4da82f..5429f8c542b5 100644
--- a/dev-lang/icc/files/8.1.030/icpc
+++ b/dev-lang/icc/files/8.1.030/icpc
@@ -1,4 +1,4 @@
 #!/bin/sh
-export INTEL_LICENSE_FILE="/opt/intel/compiler80/licenses"
-export LD_LIBRARY_PATH="/opt/intel/compiler80/lib"
-/opt/intel/compiler80/bin/icpcbin $*
+export INTEL_LICENSE_FILE="/opt/intel/compiler81/licenses"
+export LD_LIBRARY_PATH="/opt/intel/compiler81/lib"
+/opt/intel/compiler81/bin/icpcbin $*
diff --git a/dev-lang/icc/files/8.1.032/05icc-ifc b/dev-lang/icc/files/8.1.032/05icc-ifc
new file mode 100644
index 000000000000..7bb8a469943f
--- /dev/null
+++ b/dev-lang/icc/files/8.1.032/05icc-ifc
@@ -0,0 +1,6 @@
+IA32ROOT=/opt/intel/compiler81
+INTEL_FLEXLM_LICENSE=/opt/intel/compiler81/licenses
+LDPATH=/opt/intel/compiler81/lib
+MANPATH=/opt/intel/compiler81/man
+PATH=/opt/intel/compiler81/bin
+ROOTPATH=/opt/intel/compiler81/bin
diff --git a/dev-lang/icc/files/8.1.032/icc b/dev-lang/icc/files/8.1.032/icc
new file mode 100644
index 000000000000..3ea13353c745
--- /dev/null
+++ b/dev-lang/icc/files/8.1.032/icc
@@ -0,0 +1,4 @@
+#!/bin/sh
+export INTEL_LICENSE_FILE="/opt/intel/compiler81/licenses"
+export LD_LIBRARY_PATH="/opt/intel/compiler81/lib"
+/opt/intel/compiler81/bin/iccbin $*
diff --git a/dev-lang/icc/files/8.1.032/iccifc.conf b/dev-lang/icc/files/8.1.032/iccifc.conf
new file mode 100644
index 000000000000..4f5d6789c65d
--- /dev/null
+++ b/dev-lang/icc/files/8.1.032/iccifc.conf
@@ -0,0 +1,29 @@
+#This file is used to set global (hopefully) compiler variables for the 
+#Intel ICC and IFC compilers.  The ICFLAGS and ICCFLAGS are the 
+#equivalents of the CFLAGS and CXXFLAGS - specific for ICC & IFC.
+
+#Note that the following flags are currently considered to be rather
+#problematic, and you may experience significant difficulty in emerges
+#with these flags
+#
+# -ip -ipo -ipo_obj -static -fast -cxxlib-gcc
+#
+
+#The following settings are a good starting point for Pentium 4 owners.
+#Pentium 3 owners should replace -xN with -xK
+#Pentium M owners should replace -xN with -xB
+#Prescott owners should replace -xN with -xP
+
+ICFLAGS = "-O2 -xN -noalign"
+ICXXFLAGS = "${ICFLAGS}"
+IFCFLAGS = "${ICFLAGS}"
+
+#The following variables define the compilers and linkers
+
+ICC = "icc"
+ICXX = "icpc"
+ICPP = "${ICC} -E"
+ICXXCPP = "${ICXX} -E"
+IFC = "ifc"
+ILD = "xild"
+IAR = "xiar"
diff --git a/dev-lang/icc/files/8.1.032/icpc b/dev-lang/icc/files/8.1.032/icpc
new file mode 100644
index 000000000000..5429f8c542b5
--- /dev/null
+++ b/dev-lang/icc/files/8.1.032/icpc
@@ -0,0 +1,4 @@
+#!/bin/sh
+export INTEL_LICENSE_FILE="/opt/intel/compiler81/licenses"
+export LD_LIBRARY_PATH="/opt/intel/compiler81/lib"
+/opt/intel/compiler81/bin/icpcbin $*
diff --git a/dev-lang/icc/files/digest-icc-8.1.032 b/dev-lang/icc/files/digest-icc-8.1.032
new file mode 100644
index 000000000000..40bce2584ec5
--- /dev/null
+++ b/dev-lang/icc/files/digest-icc-8.1.032
@@ -0,0 +1 @@
+MD5 a6ca6bf933f9e39971dfa89a27963c3a l_cc_pc_8.1.032.tar.gz 135581695
diff --git a/dev-lang/icc/icc-8.1.030.ebuild b/dev-lang/icc/icc-8.1.030.ebuild
index c9887caf0b3c..f97ebef9e84e 100644
--- a/dev-lang/icc/icc-8.1.030.ebuild
+++ b/dev-lang/icc/icc-8.1.030.ebuild
@@ -1,12 +1,11 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/icc-8.1.030.ebuild,v 1.2 2005/05/27 05:14:22 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/icc-8.1.030.ebuild,v 1.3 2005/05/31 19:17:51 karltk Exp $
 
 inherit rpm
 
 DESCRIPTION="Intel C++ Compiler - Intel's Pentium optimized compiler for Linux"
 SRC_URI="l_cc_pc_${PV}.tar.gz"
-# Both IA32 and IA64 can be installed here since all files have a distinct name.
 HOMEPAGE="http://www.intel.com/software/products/compilers/clin/"
 LICENSE="icc-7.0"
 RDEPEND=">=sys-libs/glibc-2.2.5
@@ -22,7 +21,9 @@ src_unpack() {
 
 	cd ${S} || die
 
-	# Only use our architecture
+	# 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.
 	if [ "$ARCH" = "x86" ]
 	then
 		rm -f intel-*.ia64.rpm
@@ -41,13 +42,10 @@ src_unpack() {
 }
 
 src_compile() {
-	# From UNTAG_CFG_FILES() in 'install.sh'
-	# Keep the Fortran bits(...)
-	for FILE in $(find ${S}/opt/intel_*/bin/ -regex '.*[ei](cc|fort|fc|cpc)$\|.*cfg$\|.*pcl$\|.*vars[^/]*.c?sh$' 2>/dev/null)
-	do
-		sed s@\<INSTALLDIR\>@${INSTALL_DIR}@g ${FILE} > ${FILE}.abs
-		mv -f ${FILE}.abs ${FILE}
-		chmod 755 ${FILE}
+	instdir=/opt/intel/compiler81
+
+	for x in opt/intel_cc_80/bin/{iccvars.csh,iccvars.sh} opt/intel_idb_80/bin/idbvars.{csh,sh} ; do
+		sed "s|<INSTALLDIR>|${instdir}|g" -i $x
 	done
 
 	# == SRC_BASE
@@ -80,7 +78,7 @@ src_compile() {
 }
 
 src_install () {
-	instdir=/opt/intel/compiler80
+	instdir=/opt/intel/compiler81
 	dodoc ${S}/lgpltext
 	dodoc ${S}/clicense
 	dodir ${instdir}
@@ -94,21 +92,23 @@ src_install () {
 }
 
 pkg_postinst () {
+	instdir=/opt/intel/compiler81
+
 	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 ${INSTALL_DIR}/doc/"
+	einfo "Documentation can be found in ${instdir}/doc/"
 	einfo
-	einfo "You will need to place your license in ${INSTALL_DIR}/licenses/"
+	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 '${INSTALL_DIR}'"
+	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."
diff --git a/dev-lang/icc/icc-8.1.032.ebuild b/dev-lang/icc/icc-8.1.032.ebuild
new file mode 100644
index 000000000000..993d1946de4e
--- /dev/null
+++ b/dev-lang/icc/icc-8.1.032.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/icc-8.1.032.ebuild,v 1.1 2005/05/31 19:17:51 karltk Exp $
+
+inherit rpm
+
+DESCRIPTION="Intel C++ Compiler - Intel's Pentium optimized compiler for Linux"
+SRC_URI="l_cc_pc_${PV}.tar.gz"
+HOMEPAGE="http://www.intel.com/software/products/compilers/clin/"
+LICENSE="icc-7.0"
+RDEPEND=">=sys-libs/glibc-2.2.5
+	x86? ( sys-libs/lib-compat )"
+SLOT="8.1"
+KEYWORDS="~x86"
+IUSE=""
+RESTRICT="nostrip fetch"
+S="${WORKDIR}/l_cc_pc_${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.
+	if [ "$ARCH" = "x86" ]
+	then
+		rm -f intel-*.ia64.rpm
+	else
+		rm -f intel-*.i386.rpm
+	fi
+
+	for x in *.rpm
+	do
+		# WORKDIR must be set properly for rpm_unpack()
+		rpm_unpack ${S}/${x}
+	done
+
+	mv ${WORKDIR}/opt ${S}/
+
+}
+
+src_compile() {
+	instdir=/opt/intel/compiler81
+
+	for x in opt/intel_cc_80/bin/{iccvars.csh,iccvars.sh} opt/intel_idb_80/bin/idbvars.{csh,sh} ; 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_80/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_80/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_80/"{doc,man,include} -type f -exec chmod -x "{}" ";"
+	find "${S}/opt/intel_cc_80/lib" -name \*.a -exec chmod -x "{}" ";"
+	find "${S}/opt/intel_idb_80/"{doc,man} -type f -exec chmod -x "{}" ";"
+}
+
+src_install () {
+	instdir=/opt/intel/compiler81
+	dodoc ${S}/lgpltext
+	dodoc ${S}/clicense
+	dodir ${instdir}
+	cp -a opt/intel_cc_80/* ${D}/${instdir}
+	cp -a opt/intel_idb_80/* ${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/compiler81
+
+	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."
+}