Fix env.d file and workaround for bug 282146 for amd64. Re-keyword ~amd64 only

Package-Manager: portage-2.2_rc30/cvs/Linux x86_64

3 files changed, 45 insertions, 11 deletions

diff --git a/dev-lang/icc/ChangeLog b/dev-lang/icc/ChangeLog
index f8640f6c799a..ae6fc14c1086 100644
--- a/dev-lang/icc/ChangeLog
+++ b/dev-lang/icc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/icc
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/ChangeLog,v 1.70 2009/08/22 19:55:40 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/ChangeLog,v 1.71 2009/08/23 21:28:09 weaver Exp $
+
+*icc-11.1.046-r2 (23 Aug 2009)
+
+  23 Aug 2009; Andrey Kislyuk <weaver@gentoo.org> -icc-11.1.046-r1.ebuild,
+  +icc-11.1.046-r2.ebuild:
+  Fix env.d file and workaround for bug 282146 for amd64. Re-keyword ~amd64 only
 
   22 Aug 2009; William Hubbs <williamh@gentoo.org> icc-10.0.026.ebuild,
   icc-10.1.017-r1.ebuild, icc-10.1.018.ebuild, icc-11.1.046-r1.ebuild:
diff --git a/dev-lang/icc/Manifest b/dev-lang/icc/Manifest
index d7c54a1cef33..09e37a8a73ae 100644
--- a/dev-lang/icc/Manifest
+++ b/dev-lang/icc/Manifest
@@ -11,6 +11,6 @@ DIST l_cproc_p_11.1.046.tgz 1351950106 RMD160 3793d9f6b9f6335e6a9bebf16012d79b38
 EBUILD icc-10.0.026.ebuild 3129 RMD160 b19ec2bf284991eca67a38d7e3aa811a663d7476 SHA1 83837b06769619390e2828fbe39aa50cdb444665 SHA256 b997df857b25ef33023b80c8a99bafe2dfb363186310b7c8c1d911187b8c7f6a
 EBUILD icc-10.1.017-r1.ebuild 3096 RMD160 45b7ad8bc5cb872ae880288696add1998ab6931a SHA1 6729ad0936124b28c05d7f32f2b664e7a0e0bf85 SHA256 4f5fd1f6d0947ec0bc3eee8ab675ab1fa80bc4041422fedf70f8c8c180c5f16c
 EBUILD icc-10.1.018.ebuild 3157 RMD160 89cd12e401300cf22761c4b6c4086749250455f3 SHA1 9030bfb7948c29e59923347a8251a335a5d3cbd8 SHA256 509d27f3231e56506b174fbb194aefdfa77d72fbc49ce77dfd7a1ebae0facbae
-EBUILD icc-11.1.046-r1.ebuild 2989 RMD160 442af32c19d26c0288025d8b8a2cc1da742a5cb3 SHA1 6c904174d6312e89e6eff523543b9c7c8e4d8eba SHA256 6c12221c115efa9c9e8db3e2189019acdde55558c2fc8a0a16fa80828eb877df
-MISC ChangeLog 14490 RMD160 afa3641e236fa9210b4751480b2a692980584755 SHA1 a21b0b5d561d6d3c31b2616fe6a4f16d845395b6 SHA256 fb4891417106578983c67975a91b8a1ff6e201aea53d164f07fd52245318ac21
+EBUILD icc-11.1.046-r2.ebuild 4343 RMD160 bbab94992740250fecc6812e3e7b10410af48adf SHA1 e08252d980637364d4770afcd95ef5783d1e85b5 SHA256 ed5e96282de9c97d9a77e3e63fe016a966c225d9d1e1e60e0a50d362659ed2b5
+MISC ChangeLog 14704 RMD160 62d776b6d1c2fb21dadaa8e6f5d698b1261929f9 SHA1 20b1de6a75d579a131a3b737a16edbd789981280 SHA256 12ed3625332453d14bf8e72ea295b1de2124a284f7df00706a5c36c7372a40af
 MISC metadata.xml 781 RMD160 fbb6b83d1b2f080aa5390e80390f21a10650ad91 SHA1 6eabf23989797b30f1ab89e4a3c557d2548a72ff SHA256 9ca47151619d8cae7f6480dff40d195011bb82d912b74ef8223176a8b0bae487
diff --git a/dev-lang/icc/icc-11.1.046-r1.ebuild b/dev-lang/icc/icc-11.1.046-r2.ebuild
index 9a0a6928fbc0..5a43f5403aae 100644
--- a/dev-lang/icc/icc-11.1.046-r1.ebuild
+++ b/dev-lang/icc/icc-11.1.046-r2.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/icc-11.1.046-r1.ebuild,v 1.5 2009/08/22 20:29:05 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/icc-11.1.046-r2.ebuild,v 1.1 2009/08/23 21:28:09 weaver Exp $
 
 EAPI="2"
 
+inherit toolchain-funcs
+
 PID=1536
 PB=cproc
 DESCRIPTION="Intel C/C++ optimized compiler for Linux"
@@ -24,7 +26,7 @@ SRC_URI="http://registrationcenter-download.intel.com/irc_nas/${PID}/${PACKAGEID
 LICENSE="Intel-SDP"
 SLOT="0"
 IUSE=""
-KEYWORDS=""
+KEYWORDS="~amd64"
 
 RESTRICT="mirror strip binchecks"
 
@@ -65,17 +67,33 @@ src_install() {
 	if use ia64; then MYARCH=ia64; fi
 	if use x86; then MYARCH=ia32; fi
 
-	env - bash --noprofile --norc -c "source '${D}/${INSTALL_DIR}/bin/iccvars.sh' ${MYARCH}; env|egrep -v '(PWD|SHLVL|_)='" > ${ENV_FILE}
-	doenvd ${ENV_FILE} || die
+	# By default, icpc 11.1 will prepend /usr to these paths, failing to find stdc++ headers
+	cat <<EOF >> "${D}/${INSTALL_DIR}/bin/${MYARCH}/icpc.cfg"
+-nostdinc++
+-isystem/usr/lib/gcc/${CHOST}/$(gcc-fullversion)/include/g++-v4
+-isystem/usr/lib/gcc/${CHOST}/$(gcc-fullversion)/include/g++-v4/${CHOST}
+-isystem/usr/lib/gcc/${CHOST}/$(gcc-fullversion)/include/g++-v4/backward
+EOF
+
+	cat <<EOF > ${ENV_FILE}
+MANPATH=${ROOT}${INSTALL_DIR}/man/en_US
+INTEL_LICENSE_FILE=${ROOT}${INSTALL_DIR}/licenses:${ROOT}opt/intel/licenses
+LIBRARY_PATH=${ROOT}${INSTALL_DIR}/lib/intel64:${ROOT}${INSTALL_DIR}/tbb/em64t/cc4.1.0_libc2.4_kernel2.6.16.21/lib
+LD_LIBRARY_PATH=${ROOT}${INSTALL_DIR}/lib/intel64:${ROOT}${INSTALL_DIR}/tbb/em64t/cc4.1.0_libc2.4_kernel2.6.16.21/lib
+CPATH=${ROOT}${INSTALL_DIR}/tbb/include
+NLSPATH=${ROOT}${INSTALL_DIR}/lib/intel64/locale/%l_%t/%N
+PATH=${ROOT}${INSTALL_DIR}/bin/${MYARCH}
+ROOTPATH=${ROOT}${INSTALL_DIR}/bin/${MYARCH}
+DYLD_LIBRARY_PATH=${ROOT}${INSTALL_DIR}/tbb/em64t/cc4.1.0_libc2.4_kernel2.6.16.21/lib
+EOF
 
-	# PROFILE_FILE=${PN}.sh
-	# echo "source ${ROOT}${INSTALL_DIR}/bin/iccvars.sh ${MYARCH}" >> ${PROFILE_FILE}
-	# exeinto /etc/profile.d; doexe ${PROFILE_FILE} || die
+	doenvd ${ENV_FILE} || die
 
-	mkdir -p "${D}/opt/intel/licenses"
+	keepdir /opt/intel/licenses
 }
 
 pkg_postinst() {
+	env-update
 	elog "${PN} requires a license file in order to run."
 	elog "To receive a restrictive non-commercial license, please register at:"
 	elog "http://www.intel.com/cd/software/products/asmo-na/eng/download/download/219771.htm"
@@ -86,4 +104,14 @@ pkg_postinst() {
 	elog "\t dev-lang/idb"
 	elog "\t sci-libs/ipp"
 	elog "\t sci-libs/mkl"
+	ewarn
+	ewarn "The ${P} C++ compiler (icpc) is unable to find the GNU C++ headers on Gentoo."
+	ewarn "To correct this, the following icpc options have been put in the file"
+	ewarn "${ROOT}${INSTALL_DIR}/bin/${MYARCH}/icpc.cfg:"
+	ewarn "\t -nostdinc++"
+	ewarn "\t -isystem/usr/lib/gcc/${CHOST}/$(gcc-fullversion)/include/g++-v4"
+	ewarn "\t -isystem/usr/lib/gcc/${CHOST}/$(gcc-fullversion)/include/g++-v4/${CHOST}"
+	ewarn "\t -isystem/usr/lib/gcc/${CHOST}/$(gcc-fullversion)/include/g++-v4/backward"
+	ewarn "You will have to update these lines every time you upgrade GCC for icpc to work."
+	ewarn
 }