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

(Portage version: 2.2_rc42/cvs/Linux x86_64)

3 files changed, 164 insertions, 3 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/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>