Version bump. Completely rewritten. Now ship with mkl, ipp, and idb. Added eclipse plugin, thanks to Jacek Szafarkiewicz. No more rpm dependency (fixing bug #282095), no more env-update in pkg_postinstall (bug #284212). Merging icc and ifc environment files. dev-lang/idb, sci-libs/mkl and sci-libs/ipp will follow icc version numbering

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

4 files changed, 180 insertions, 5 deletions

diff --git a/dev-lang/icc/ChangeLog b/dev-lang/icc/ChangeLog
index ae6fc14c1086..47c117bf7825 100644
--- a/dev-lang/icc/ChangeLog
+++ b/dev-lang/icc/ChangeLog
@@ -1,6 +1,16 @@
 # 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.71 2009/08/23 21:28:09 weaver Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/ChangeLog,v 1.72 2009/10/06 20:33:05 bicatali Exp $
+
+*icc-11.1.056 (06 Oct 2009)
+
+  06 Oct 2009; Sébastien Fabbro <bicatali@gentoo.org> +icc-11.1.056.ebuild,
+  metadata.xml:
+  Version bump. Completely rewritten. Now ship with mkl, ipp, and idb. Added
+  eclipse plugin, thanks to Jacek Szafarkiewicz. No more rpm dependency
+  (fixing bug #282095), no more env-update in pkg_postinstall (bug #284212).
+  Merging icc and ifc environment files. dev-lang/idb, sci-libs/mkl and
+  sci-libs/ipp will follow icc version numbering
 
 *icc-11.1.046-r2 (23 Aug 2009)
 
diff --git a/dev-lang/icc/Manifest b/dev-lang/icc/Manifest
index 09e37a8a73ae..0ec0e02bdfba 100644
--- a/dev-lang/icc/Manifest
+++ b/dev-lang/icc/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST l_cc_c_10.0.026_ia32.tar.gz 41278910 RMD160 7c2046d1c8bfbf98639c4cc1d77db0ccf5fd5637 SHA1 b44fdb3f91df847b03307b96256ea83252983432 SHA256 36258784fba6550a117b30e9bfd48d414d8986b95e802191be0b37005eedc0f6
 DIST l_cc_c_10.0.026_ia64.tar.gz 64662221 RMD160 51601383678f759979a2c9d456102e28a9d017bf SHA1 2f71ffe6fcb9d8a2bb8fe46bf82dc29382e5cdc5 SHA256 1d55e6040fef6c3e42725049c19ab80c506efff99b7810e04cc55731d0e31b19
 DIST l_cc_c_10.0.026_intel64.tar.gz 36405579 RMD160 bcf8bec436ad4c9e91b35201e709491b197f6145 SHA1 9a39aee94d2cd67476a4aad198657c1333854676 SHA256 00ca4de9510e04c7d3f27590e21339d663d17b12b39ebc5153d9bd58e750128e
@@ -8,9 +11,20 @@ DIST l_cc_p_10.1.018_ia32.tar.gz 51149040 RMD160 94b8d6ae7c93a7dcc32b551bf0fadc3
 DIST l_cc_p_10.1.018_ia64.tar.gz 73278803 RMD160 8f0c1a6eb2d7675cd6fc5ecb65e5d417cc6e7b08 SHA1 3ef78eb0e1862a0d3d1678d9b76709be93b90c35 SHA256 6f00be420554f4bbd10aba2f94a71c27bb4f2c9a544b7104da51e722f8754a83
 DIST l_cc_p_10.1.018_intel64.tar.gz 40722995 RMD160 2da7ff6e9cfb31bef9d3a627df0bae9d4e5b6929 SHA1 aa7a30647254b9e40fc52b259cc05d6a35245c67 SHA256 2e07bc0d647c62a00f366e00e7823c2d902393db45fdc0141c77912b68542bf9
 DIST l_cproc_p_11.1.046.tgz 1351950106 RMD160 3793d9f6b9f6335e6a9bebf16012d79b3856c4a6 SHA1 2b0ab4bcae4ecc760fe2d5ee8b690cc92624a455 SHA256 d222a832dd89407b459030bc0183033f9eb861637e7bfbfe817cb0f6a3455f80
+DIST l_cproc_p_11.1.056_ia32.tgz 740972172 RMD160 0da37869c1c9b664fef15d8b483b0761491bbe01 SHA1 e32f3bb84e578b47e925d957b14b2aea39076690 SHA256 ee0fbab7f3876d8ec5555cb8d311bb15f680cf7645d7d2d3075486f804af1ed8
+DIST l_cproc_p_11.1.056_ia64.tgz 572464763 RMD160 96a7064ea634bb7b1df4a02af0f4071d6b23bfe3 SHA1 788576e1081783d5ba1db7ef4ac8fcd4f55f2975 SHA256 0ee4a354f77280c91d419b1c35cd61c53c14e2d565ef188977fd6a8ad00d702c
+DIST l_cproc_p_11.1.056_intel64.tgz 811017975 RMD160 d5860603a80d84c345d0fdec2403aca27fb548ab SHA1 61d5f3eebde0d1b6d09de386ae05b11bd5dfd684 SHA256 7788f9f8d90edb627e3807cfd9830f568b8bf2d3647aec8cdab8ca945316b684
 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-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
+EBUILD icc-11.1.056.ebuild 4240 RMD160 65ae1427d3d7674c6f07b15c00992dc6b6473988 SHA1 735dce43647ba8dc58bf44273d05a7c49ea6d261 SHA256 a4e5dafd827400a92c396b036d111f67fea402facf68d17a98c1cde2bed0aa62
+MISC ChangeLog 15176 RMD160 d0672909f77adb07d1b8f8fd79e1e111f7e5f1ce SHA1 6e31bc6372aa35e5cfa229880dda6df42ad3817f SHA256 d26698dc98b57c0ff656b0052a0bef69522f631d77837b96f577ff5d22181f32
+MISC metadata.xml 1060 RMD160 578731577b92dc9de52fdcb2f8089c266df2d264 SHA1 ae50d96f73cc03149ab1751693e866661d3489b4 SHA256 1da0dab6ddde0006b767eea33de864a7d141e4b43f0dc8ea9c5e6b96d79d0f20
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkrLqYoACgkQ1ycZbhPLE2DCxQCfdRRUaySy4mv06Emi0rHbXj4W
+T3UAn2IF6NOkRzud/56t6OGadwKA3oER
+=dcN1
+-----END PGP SIGNATURE-----
diff --git a/dev-lang/icc/icc-11.1.056.ebuild b/dev-lang/icc/icc-11.1.056.ebuild
new file mode 100644
index 000000000000..8284ec95b82c
--- /dev/null
+++ b/dev-lang/icc/icc-11.1.056.ebuild
@@ -0,0 +1,145 @@
+# 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.056.ebuild,v 1.1 2009/10/06 20:33:05 bicatali Exp $
+
+EAPI=2
+
+inherit rpm versionator check-reqs
+
+PB=cproc
+PACKAGEID="l_${PB}_p_${PV}"
+RELEASE="$(get_version_component_range 1-2)"
+BUILD="$(get_version_component_range 3)"
+PID=1583
+
+DESCRIPTION="Intel compiler suite for Linux"
+HOMEPAGE="http://www.intel.com/software/products/compilers/clin/"
+SRC_COM="http://registrationcenter-download.intel.com/irc_nas/${PID}/${PACKAGEID}"
+SRC_URI="amd64? ( ${SRC_COM}_intel64.tgz )
+	ia64? ( ${SRC_COM}_ia64.tgz )
+	x86?  ( ${SRC_COM}_ia32.tgz )"
+
+LICENSE="Intel-SDP"
+SLOT="0"
+IUSE="eclipse +idb ipp mkl"
+KEYWORDS="~amd64 ~x86"
+
+RESTRICT="mirror strip binchecks"
+
+DEPEND=""
+RDEPEND="~virtual/libstdc++-3.3
+	amd64? ( app-emulation/emul-linux-x86-compat )
+	eclipse? ( >=dev-util/eclipse-sdk-3.4 )"
+
+DESTINATION="opt/intel/Compiler/${RELEASE}/${BUILD}"
+
+pkg_setup() {
+	CHECKREQS_MEMORY=1024
+	CHECKREQS_DISK_BUILD=2048
+	use idb && use ipp && use mkl && CHECKREQS_DISK_BUILD=3072
+	check_reqs
+	IARCH=ia32
+	use amd64 && IARCH=intel64
+	use ia64 && IARCH=ia64
+}
+
+src_unpack() {
+	unpack ${A}
+	mv "${WORKDIR}"/l_* "${S}"
+	cd "${S}"
+	# tbb is open source, thus built from sources in dev-cpp/tbb
+	rm -f rpm/*tbb*.rpm
+	use idb || rm -f rpm/*idb*.rpm
+	use ipp || rm -f rpm/*ipp*.rpm
+	use mkl || rm -f rpm/*mkl*.rpm
+	use eclipse || rm -f rpm/*cdt*.rpm
+	if has_version "~dev-lang/ifc-${PV}"; then
+		rm -f rpm/*cprolib*.rpm
+		use idb && built_with_use dev-lang/ifc idb && rm -f rpm/*idb*.rpm
+		use mkl && built_with_use dev-lang/ifc mkl && rm -f rpm/*mkl*.rpm
+	fi
+	for x in rpm/intel*.rpm; do
+		einfo "Extracting $(basename ${x})..."
+		rpm_unpack ./${x} || die "rpm_unpack ${x} failed"
+	done
+}
+
+link_eclipse_plugins() {
+	ECLIPSE_V="$1"
+	CDT_V="$2"
+	einfo "Linking eclipse (v${ECLIPSE_V}) plugin cdt (v${CDT_V})"
+	dodir /usr/$(get_libdir)/eclipse-${ECLIPSE_V}/plugins
+	dodir /usr/$(get_libdir)/eclipse-${ECLIPSE_V}/features
+
+	for f in "${DESTINATION}/eclipse_support/cdt${CDT_V}/eclipse/plugins"/*; do
+		dosym "${ROOT}${f}" /usr/$(get_libdir)/eclipse-${ECLIPSE_V}/plugins
+	done
+
+	for f in "${DESTINATION}/eclipse_support/cdt${CDT_V}/eclipse/features"/*; do
+		dosym "${ROOT}${f}" /usr/$(get_libdir)/eclipse-${ECLIPSE_V}/features
+	done
+	eend $?
+}
+
+
+src_prepare() {
+	# from the PURGE_UB804_FNP in pset/install_cc.sh
+	# rm -f "${DESTINATION}"/lib/*/*libFNP.so || die
+
+	# extract the tag function from the original install
+	sed -n \
+		-e "s|find \$DESTINATION|find ${DESTINATION}|g" \
+		-e "s|@\$DESTINATION|@${ROOT}${DESTINATION}|g" \
+		-e '/^UNTAG_CFG_FILES[[:space:]]*(/,/^}/p' \
+		pset/install_cc.sh > tag.sh || die
+	# fix world writeable files
+	[ -d ${DESTINATION}/mkl ]  && chmod 644 \
+		${DESTINATION}/mkl/tools/{environment,builder}/* \
+		${DESTINATION}/mkl/tools/plugins/*/*
+}
+
+src_install() {
+	einfo "Tagging"
+	. ./tag.sh
+	UNTAG_CFG_FILES
+
+	keepdir /opt/intel/licenses
+	einfo "Copying files"
+	dodir "${DESTINATION}"
+	cp -pPR \
+		${DESTINATION}/* \
+		"${D}"/${DESTINATION}/ \
+		|| die "Copying ${PN} failed"
+
+	local envf=05icfc
+	cat > ${envf} <<-EOF
+		PATH="${ROOT}${DESTINATION}/bin/${IARCH}"
+		ROOTPATH="${ROOT}${DESTINATION}/bin/${IARCH}"
+		LDPATH="${ROOT}${DESTINATION}/lib/${IARCH}"
+		LIBRARY_PATH="${ROOT}${DESTINATION}/lib/${IARCH}"
+		NLSPATH="${ROOT}${DESTINATION}/lib/locale/en_US/%N"
+		MANPATH="${ROOT}${DESTINATION}/man/en_US"
+	EOF
+	if [ -n "$(diff ${ROOT}etc/env.d/${envf} ./${envf})" ]; then
+		doenvd ${envf} || die "doenvd ${envf} failed"
+	fi
+	[ -d ${DESTINATION}/idb ] && \
+		dosym ../../common/com.intel.debugger.help_1.0.0 \
+		${DESTINATION}/idb/gui/${IARCH}/plugins
+
+	if use eclipse; then
+		if has_version 'dev-util/eclipse-sdk:3.4'; then
+			link_eclipse_plugins "3.4" "5.0" || die
+		fi
+		if has_version 'dev-util/eclipse-sdk:3.5'; then
+			link_eclipse_plugins "3.5" "6.0" || die
+		fi
+	fi
+}
+
+pkg_postinst() {
+	elog "Make sure you have recieved the an Intel license."
+	elog "To receive a non-commercial license, you need to register at:"
+	elog "http://software.intel.com/en-us/articles/non-commercial-software-development/"
+	elog "Install the license file into ${ROOT}opt/intel/licenses."
+}
diff --git a/dev-lang/icc/metadata.xml b/dev-lang/icc/metadata.xml
index cc987bd3982b..afa7aa903b89 100644
--- a/dev-lang/icc/metadata.xml
+++ b/dev-lang/icc/metadata.xml
@@ -7,8 +7,8 @@
   <email>bicatali@gentoo.org</email>
 </maintainer>
 <maintainer>
-	<email>weaver@gentoo.org</email>
-	<name>Andrey Kislyuk</name>
+  <email>weaver@gentoo.org</email>
+  <name>Andrey Kislyuk</name>
 </maintainer>
 <longdescription lang="en">
   The Intel® C++ Compiler is a full featured C/C++ compiler for Intel
@@ -18,4 +18,10 @@
   documentation. The product can be installed as a non-commercial as
   well. License, terms of qualifications can be found on the web site.
 </longdescription>
+<use>
+  <flag name='eclipse'>Install the <pkg>dev-util/eclipse-sdk</pkg> plugins</flag>
+  <flag name='idb'>Install the Intel Debugger</flag>
+  <flag name='mkl'>Install the Intel Math Kernel Library</flag>
+  <flag name='ipp'>Install the Intel Integrated Primitive</flag>
+</use>
 </pkgmetadata>