Small fixes

7 files changed, 135 insertions, 6 deletions

diff --git a/dev-lang/icc/ChangeLog b/dev-lang/icc/ChangeLog
index d9ade035ac78..da88a93b6137 100644
--- a/dev-lang/icc/ChangeLog
+++ b/dev-lang/icc/ChangeLog
@@ -1,23 +1,30 @@
 # ChangeLog for dev-lang/icc
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/ChangeLog,v 1.9 2002/12/13 10:56:25 blizzy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/ChangeLog,v 1.10 2002/12/20 22:53:51 avenj Exp $
+
+*icc-7.0.065-r2 (20 Dec 2002)
+
+  20 Dec 2002; Jon Portnoy <avenj@gentoo.org> icc-7.0.065-r2.ebuild :
+
+  Fixed 05icc-ifc to include INTEL_LICENSE_FILE.
 
 *icc-7.0.065-r1 (11 Dec 2002)
 
-  11 Dec 2002; Jon Portnoy <avenj@gentoo.org> icc-7.0.065-r1.ebuild
+  11 Dec 2002; Jon Portnoy <avenj@gentoo.org> icc-7.0.065-r1.ebuild :
 
   Changed the "icc" wrapper script to properly translate gcc CFLAGS into
   icc CFLAGS.
 
 *icc-7.0.065 (10 Dec 2002)
 
-  10 Dec 2002; Jon Portnoy <avenj@gentoo.org> icc-7.0.065.ebuild:
+  10 Dec 2002; Jon Portnoy <avenj@gentoo.org> icc-7.0.065.ebuild :
 
   Changed the naming to more accurately reflect the current ICC
   version number. Also fixed the primary executable and added a warning
   about compiling important applications with icc.
 
-  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+\* Autoupdate keywords (12-6-02)
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> changed sparc ~sparc keywords
 
 *icc-7.0 (8 Dec 2002)
 
diff --git a/dev-lang/icc/files/7.0.065-r2/05icc-ifc b/dev-lang/icc/files/7.0.065-r2/05icc-ifc
new file mode 100644
index 000000000000..20c18a04bf99
--- /dev/null
+++ b/dev-lang/icc/files/7.0.065-r2/05icc-ifc
@@ -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.0.065-r2/icc b/dev-lang/icc/files/7.0.065-r2/icc
new file mode 100644
index 000000000000..6d53c6dc0c69
--- /dev/null
+++ b/dev-lang/icc/files/7.0.065-r2/icc
@@ -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.0.065-r2 b/dev-lang/icc/files/digest-icc-7.0.065-r2
new file mode 100644
index 000000000000..26c60237a081
--- /dev/null
+++ b/dev-lang/icc/files/digest-icc-7.0.065-r2
@@ -0,0 +1 @@
+MD5 e16414a571ac8cc9b69fad3a886049f1 l_cc_p_7.0.065.tar 64921600
diff --git a/dev-lang/icc/icc-7.0.065-r1.ebuild b/dev-lang/icc/icc-7.0.065-r1.ebuild
index 8ec5f1de2288..877cbc754671 100644
--- a/dev-lang/icc/icc-7.0.065-r1.ebuild
+++ b/dev-lang/icc/icc-7.0.065-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/icc-7.0.065-r1.ebuild,v 1.1 2002/12/11 23:24:16 avenj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/icc-7.0.065-r1.ebuild,v 1.2 2002/12/20 22:53:51 avenj Exp $
 
 S=${WORKDIR}
 
@@ -100,4 +100,6 @@ pkg_postinst () {
 	ewarn "depends on, read the warning above. This could potentially"
 	ewarn "render your system unusable. This is a problem with Intel's"
 	ewarn "software, _not_ with Gentoo."
+	ewarn "Please use 'source /etc/profile' prior to merging any icc-enabled"
+	ewarn "ebuilds."
 }
diff --git a/dev-lang/icc/icc-7.0.065-r2.ebuild b/dev-lang/icc/icc-7.0.065-r2.ebuild
new file mode 100644
index 000000000000..b160b2a6582f
--- /dev/null
+++ b/dev-lang/icc/icc-7.0.065-r2.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/icc-7.0.065-r2.ebuild,v 1.1 2002/12/20 22:53:51 avenj Exp $
+
+S=${WORKDIR}
+
+DESCRIPTION="Intel C++ Compiler - The Pentium optimized compiler for Linux"
+
+SRC_URI1="ftp://download.intel.com/software/products/compilers/downloads/l_cc_p_7.0.065.tar"
+SRC_URI2="ftp://download.intel.co.jp/software/products/compilers/downloads/l_cc_p_7.0.065.tar"
+SRC_URI="${SRC_URI1} ${SRC_URI2}"
+
+HOMEPAGE="http://www.intel.com/software/products/compilers/clin/"
+
+LICENSE="icc-7.0"
+
+DEPEND=">=virtual/linux-sources-2.4
+		>=sys-libs/glibc-2.2.4
+		sys-apps/cpio
+		app-arch/rpm"
+
+RDEPEND=">=virtual/linux-sources-2.4
+		>=sys-libs/glibc-2.2.4"
+
+SLOT="7"
+KEYWORDS="~x86 -ppc -sparc -alpha"
+IUSE=""
+
+src_compile() {
+	# Keep disk space to a minimum
+	rm -f intel-*.ia64.rpm
+
+	mkdir opt
+
+	for x in intel-*.i386.rpm
+	do
+		einfo "Extracting: ${x}"
+		rpm2cpio ${x} | cpio --extract --make-directories --unconditional
+	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}
+
+	# 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
+}
+
+pkg_postinst () {
+	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
+	if [ -d /opt/intel/compiler?0 ]
+	then
+		ewarn
+		ewarn "Packages compiled with older versions of icc 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."
+	fi
+	ewarn "If 'icc' breaks, use 'iccbin' instead and report a bug."
+	ewarn "NOTE: Before compiling important applications that your system"
+	ewarn "depends on, read the warning above. This could potentially"
+	ewarn "render your system unusable. This is a problem with Intel's"
+	ewarn "software, _not_ with Gentoo."
+	ewarn "Please use 'source /etc/profile' prior to merging any icc-enabled"
+	ewarn "ebuilds."
+}
diff --git a/dev-lang/icc/icc-7.0.065.ebuild b/dev-lang/icc/icc-7.0.065.ebuild
index b28e2fccffc2..972ffa337ecb 100644
--- a/dev-lang/icc/icc-7.0.065.ebuild
+++ b/dev-lang/icc/icc-7.0.065.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/icc-7.0.065.ebuild,v 1.2 2002/12/11 23:24:16 avenj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/icc-7.0.065.ebuild,v 1.3 2002/12/20 22:53:51 avenj Exp $
 
 S=${WORKDIR}