Removed obsoletes

Package-Manager: portage-2.1.10.41/cvs/Linux x86_64

9 files changed, 17 insertions, 827 deletions

diff --git a/dev-lang/icc/ChangeLog b/dev-lang/icc/ChangeLog
index 8e7c33134c59..d5699c2ab5ee 100644
--- a/dev-lang/icc/ChangeLog
+++ b/dev-lang/icc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/icc
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/ChangeLog,v 1.83 2010/12/03 18:46:33 patrick Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/ChangeLog,v 1.84 2012/02/12 23:20:14 bicatali Exp $
+
+  12 Feb 2012; Sébastien Fabbro <bicatali@gentoo.org> -icc-10.1.017-r1.ebuild,
+  -icc-10.1.018.ebuild, -icc-11.1.046-r2.ebuild, -icc-11.1.056.ebuild,
+  -icc-11.1.056-r1.ebuild, -icc-11.1.072.ebuild, icc-11.1.072-r1.ebuild:
+  Removed obsoletes
 
   03 Dec 2010; Patrick Lauer <patrick@gentoo.org> icc-11.1.056.ebuild,
   icc-11.1.056-r1.ebuild, icc-11.1.072.ebuild, icc-11.1.072-r1.ebuild:
diff --git a/dev-lang/icc/Manifest b/dev-lang/icc/Manifest
index 33a4dc9412ed..bcfa91e4efab 100644
--- a/dev-lang/icc/Manifest
+++ b/dev-lang/icc/Manifest
@@ -1,38 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+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
-DIST l_cc_p_10.1.017_ia32.tar.gz 50917413 RMD160 41f86deaab128065d43fbd7e711dbb235b235fbb SHA1 5a3fe5327a29ec96d988dda9b482ae17d1da1d55 SHA256 9211c2bcad5690b34ac616b195a9bd5b801f91a75213b6984037f94a551e14b9
-DIST l_cc_p_10.1.017_ia64.tar.gz 72917743 RMD160 398c3c991b9429702619a5d1574404a279e87be9 SHA1 7c7e42a2aeef634394ca854a83753b9d35249e93 SHA256 15c5a28b9310b05f5a0227a35f36bdb9a2ae0729a94f09d60c91965bd157f5cb
-DIST l_cc_p_10.1.017_intel64.tar.gz 40469760 RMD160 34a08752bd86631db6b8edfffb68bc4b9825295b SHA1 af25ab180e1fabaa65ef75884b59010a099d8944 SHA256 a5288827ed4c7dd5f931dfef3d197f1a8cbcf5a6d2364f48fc2823888b583fb6
-DIST l_cc_p_10.1.018_ia32.tar.gz 51149040 RMD160 94b8d6ae7c93a7dcc32b551bf0fadc31763b99bf SHA1 8a0632de44adce17f0d91afcb0b06cefaafe03d5 SHA256 93f4f88a64055251203a07b7737d3e1ec83b16c7fc4478de51f4def19feaecb0
-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
 DIST l_cproc_p_11.1.072_ia32.tgz 736080298 RMD160 a8366e268f7badb3db7fca74b29c6d4b69de1483 SHA1 58aa46a3b6d81362a8c1cf3541cb056c62aa9362 SHA256 b55bf3c5759a5cd1168ae42087a86ac28f369f4ada886a550596726b1d055aef
 DIST l_cproc_p_11.1.072_ia64.tgz 569883062 RMD160 53fc19272917d4c7ddf339d49f385d8b34b057a1 SHA1 223a7ae2716c447e12c3f43c8f1762c48049f961 SHA256 0b667d72d1e95fd1036a86e8a49b26137e8ea9db80a4dbb50a34884d69ec75bc
 DIST l_cproc_p_11.1.072_intel64.tgz 807022694 RMD160 8e424426e88c21582d6d0ad565f11f8c8f8c48d3 SHA1 f1b060b809da18e415a7c0b9dfd15b5d120833e3 SHA256 809f41b23a9eb0bef10c26b8835b4364e97daac4abeec21da4b3a4d5cefb31c1
 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 4342 RMD160 677316d85d8a56543dbcec670b700c64b04f425e SHA1 2ed84406319cdc92f6e2a19d3879473996c763d0 SHA256 55ff2909679e1a6e52115168419be3a7f22c6ccb8eb7b37e51ce82dbf0afd819
-EBUILD icc-11.1.056-r1.ebuild 4449 RMD160 86adf606a8df873d7ae9bde091fd18b4502c851d SHA1 3af453260ffcd1148e5260b45ed48d7325f6d6e4 SHA256 0b310179e1d9db3a74063c3b0136a8f31ea778a7b17bdabbca2c5622a33d9d3f
-EBUILD icc-11.1.056.ebuild 4406 RMD160 5493a0b33423108dfce5b68796f3f582399aaa36 SHA1 8c5c350d0fabd72446e5a268b61487e0f1c28902 SHA256 c19b6e681fc03f38115784a9de6911037f6ecca77a01f701a8bdd3bba184a20a
-EBUILD icc-11.1.072-r1.ebuild 4914 RMD160 9e0e8036399ece4e81ecc298bb92ea9400fd587d SHA1 5b6b306143c0c46f912ec7e54a70079d48de2cd3 SHA256 11c03b1e869c80ca42bab2ad354041519d4e0368ad3f62544771a1183cfca4d8
-EBUILD icc-11.1.072.ebuild 4446 RMD160 b7995c401696f644fb6f8d1eb3277a49cf24a646 SHA1 a3b8ee99b41bfbe7fdcb17ee47bbc636b2af247f SHA256 32479b701d1eed82c6afe185a5e6c9442322779245f1f9c71c7b77f187acaccf
-MISC ChangeLog 16784 RMD160 74a24e28c4adebe992fa078dc86a84038f40d4d9 SHA1 443d4b32a77ef381e9c7088c8d784f65d96ca128 SHA256 c6ed59902ed1b95dc8359c45bccbde0372234726b7b52b293ef3c5c04bcbce13
+EBUILD icc-11.1.072-r1.ebuild 4911 RMD160 50d0d68a56026336d9ea559cc9c6f86440a3a930 SHA1 d06f7ff06638e93643b7dfa4ff48963a1ef78d76 SHA256 74a11133effc226d9e895779b7f19f8a70b5b7272a20f1335b51a9ee84c7bdd4
+MISC ChangeLog 17030 RMD160 1ef20efc6e5c5cb8156ea37f78524610ef09faea SHA1 225ec1a0aa26aee0dc16bc1f8fe6d1d9dbe1f4f2 SHA256 de7e566af0bcf72949f3b52526e5857f023d0dbf5ec1795e6267c8b0ca270b74
 MISC metadata.xml 1039 RMD160 ecf04614bbb55b6fb788e531eccb5521aa48dbbd SHA1 057584e0822154e6510b2aa4630db7aadf3c278e SHA256 7deae4d690cdeb050de7a0524d524e98bc11399d5cbf222f7b3f3e9864cc3223
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iJwEAQEIAAYFAk59jUsACgkQfXuS5UK5QB1lQQP/eBxx2WQM+oeEgSlDM6Xg7ZdB
-2jY/TPjgXv8xdvViaDr+w7NH/EmzVoh9ZX3SU6H7fzlA5v5rUYwQ9u1yFXFkUNe7
-JRMpItcYo8ptnS5CjGR61S+pyevgzcuQFUGIBh9O81Z/uEk2hVSducaMAvjVcsKc
-arvLCEStBRo/2dppmp4=
-=wEAA
+iEYEARECAAYFAk84STYACgkQ1ycZbhPLE2BS0wCghRodH537J+lXZ9JNQYGQhB3S
+jvkAnR4oUgTmmCZiXTasHlovb1t/ZOVp
+=Op1I
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/icc/icc-10.1.017-r1.ebuild b/dev-lang/icc/icc-10.1.017-r1.ebuild
deleted file mode 100644
index a51108878673..000000000000
--- a/dev-lang/icc/icc-10.1.017-r1.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# 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-10.1.017-r1.ebuild,v 1.5 2009/08/22 20:29:05 williamh Exp $
-
-inherit rpm eutils check-reqs
-
-PID=1136
-PB=cc
-PEXEC="icc icpc"
-DESCRIPTION="Intel C/C++ optimized compiler for Linux"
-HOMEPAGE="http://www.intel.com/software/products/compilers/clin/"
-
-###
-# everything below common to ifc and icc
-# no eclass: very likely to change for next versions
-###
-PACKID="l_${PB}_p_${PV}"
-KEYWORDS="~amd64 ~ia64 ~x86"
-SRC_COM="http://registrationcenter-download.intel.com/irc_nas/${PID}/${PACKID}"
-SRC_URI="amd64? ( ${SRC_COM}_intel64.tar.gz )
-	ia64? ( ${SRC_COM}_ia64.tar.gz )
-	x86?  ( ${SRC_COM}_ia32.tar.gz )"
-
-LICENSE="Intel-SDP"
-SLOT="0"
-
-RESTRICT="test strip mirror"
-IUSE=""
-DEPEND=""
-RDEPEND="~virtual/libstdc++-3.3
-	amd64? ( app-emulation/emul-linux-x86-compat )"
-
-pkg_setup() {
-	# Check if we have enough RAM and free diskspace
-	CHECKREQS_MEMORY="512"
-	local disk_req="300"
-	use amd64 && disk_req="400"
-	use ia64 && disk_req="350"
-	CHECKREQS_DISK_BUILD=${disk_req}
-	check_reqs
-}
-
-src_unpack() {
-	unpack ${A}
-	mv "${WORKDIR}"/l_* "${S}"
-	cd "${S}"
-
-	local ext=
-	use amd64 && ext=e
-	INSTALL_DIR=/opt/intel/${PB}${ext}/${PV}
-
-	# debugger installed with dev-lang/idb
-	rm -f data/intel*idb*.rpm
-
-	for x in data/intel*.rpm; do
-		einfo "Extracting $(basename ${x})..."
-		rpm_unpack "${S}/${x}" || die "rpm_unpack ${x} failed"
-	done
-
-	einfo "Fixing paths and tagging"
-	cd "${S}"/${INSTALL_DIR}/bin
-	sed -e "s|<INSTALLDIR>|${INSTALL_DIR}|g" \
-		-e 's|export -n IA32ROOT;||g' \
-		-i ${PEXEC} *sh \
-		|| die "sed fixing shells and paths failed"
-
-	cd "${S}"/${INSTALL_DIR}/doc
-	sed -e "s|\<installpackageid\>|${PACKID}|g" \
-		-e "s|\<INSTALLTIMECOMBOPACKAGEID\>|${PACKID}|g" \
-		-i *support \
-		|| die "sed support file failed"
-	chmod 644 *support
-
-	if use amd64; then
-		cat <<-EOF >>"${S}"/${INSTALL_DIR}/bin/icc.cfg
-		-D__amd64=__x86_64
-		-D__amd64__=__x86_64__
-		EOF
-		cat <<-EOF >>"${S}"/${INSTALL_DIR}/bin/icpc.cfg
-		-D__amd64=__x86_64
-		-D__amd64__=__x86_64__
-		EOF
-	fi
-}
-
-src_install() {
-	einfo "Copying files"
-	dodir ${INSTALL_DIR}
-	cp -pPR \
-		"${S}"/${INSTALL_DIR}/* \
-		"${D}"/${INSTALL_DIR}/ \
-		|| die "Copying ${PN} failed"
-
-	local env_file=05${PN}
-	cat > ${env_file} <<-EOF
-		PATH=${INSTALL_DIR}/bin
-		ROOTPATH=${INSTALL_DIR}/bin
-		LDPATH=${INSTALL_DIR}/lib
-		MANPATH=${INSTALL_DIR}/man
-	EOF
-	doenvd ${env_file} || die "doenvd ${env_file} failed"
-}
-
-pkg_postinst () {
-	# remove left over from unpacking
-	rm -f "${ROOT}"/opt/intel/{intel_sdp_products.db,.*.log} \
-		|| die "remove logs failed"
-
-	elog "Make sure you have recieved the a license for ${PN},"
-	elog "you cannot run ${PN} without a license file."
-	elog "To receive a non-commercial license, you need to register."
-	elog "Read the website for more information on this license:"
-	elog "${HOMEPAGE}"
-	elog "Then put the license file into ${ROOT}/opt/intel/licenses."
-	elog "\nTo use ${PN} issue first \n\tsource ${ROOT}/etc/profile"
-	elog "Debugger is installed with dev-lang/idb"
-}
diff --git a/dev-lang/icc/icc-10.1.018.ebuild b/dev-lang/icc/icc-10.1.018.ebuild
deleted file mode 100644
index 6d2d6e8d1389..000000000000
--- a/dev-lang/icc/icc-10.1.018.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# 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-10.1.018.ebuild,v 1.5 2009/08/22 20:29:05 williamh Exp $
-
-inherit rpm eutils check-reqs
-
-PID=1205
-PB=cc
-PEXEC="icc icpc"
-DESCRIPTION="Intel C/C++ optimized compiler for Linux"
-HOMEPAGE="http://www.intel.com/software/products/compilers/clin/"
-
-###
-# everything below common to ifc and icc
-# no eclass: very likely to change for next versions
-###
-PACKID="l_${PB}_p_${PV}"
-KEYWORDS="~amd64 ~ia64 ~x86"
-SRC_COM="http://registrationcenter-download.intel.com/irc_nas/${PID}/${PACKID}"
-SRC_URI="amd64? ( ${SRC_COM}_intel64.tar.gz )
-	ia64? ( ${SRC_COM}_ia64.tar.gz )
-	x86?  ( ${SRC_COM}_ia32.tar.gz )"
-
-LICENSE="Intel-SDP"
-SLOT="0"
-
-RESTRICT="test strip mirror"
-IUSE=""
-DEPEND=""
-RDEPEND="~virtual/libstdc++-3.3
-	amd64? ( app-emulation/emul-linux-x86-compat )"
-
-pkg_setup() {
-	# Check if we have enough RAM and free diskspace
-	CHECKREQS_MEMORY="512"
-	local disk_req="300"
-	use amd64 && disk_req="400"
-	use ia64 && disk_req="350"
-	CHECKREQS_DISK_BUILD=${disk_req}
-	check_reqs
-}
-
-src_unpack() {
-	unpack ${A}
-	mv "${WORKDIR}"/l_* "${S}"
-	cd "${S}"
-
-	local ext=
-	use amd64 && ext=e
-	INSTALL_DIR=/opt/intel/${PB}${ext}/${PV}
-
-	# debugger installed with dev-lang/idb
-	rm -f data/intel*idb*.rpm
-
-	for x in data/intel*.rpm; do
-		einfo "Extracting $(basename ${x})..."
-		rpm_unpack "${S}/${x}" || die "rpm_unpack ${x} failed"
-	done
-
-	einfo "Fixing paths and tagging"
-	cd "${S}"/${INSTALL_DIR}/bin
-	sed -e "s|<INSTALLDIR>|${INSTALL_DIR}|g" \
-		-e 's|export -n IA32ROOT;||g' \
-		-i ${PEXEC} *sh \
-		|| die "sed fixing shells and paths failed"
-
-	cd "${S}"/${INSTALL_DIR}/doc
-	sed -e "s|\<installpackageid\>|${PACKID}|g" \
-		-e "s|\<INSTALLTIMECOMBOPACKAGEID\>|${PACKID}|g" \
-		-i *support \
-		|| die "sed support file failed"
-	chmod 644 *support
-
-	if use amd64; then
-		cat <<-EOF >>"${S}"/${INSTALL_DIR}/bin/icc.cfg
-		-D__amd64=__x86_64
-		-D__amd64__=__x86_64__
-		-idirafter /usr/include/linux
-		EOF
-		cat <<-EOF >>"${S}"/${INSTALL_DIR}/bin/icpc.cfg
-		-D__amd64=__x86_64
-		-D__amd64__=__x86_64__
-		-idirafter /usr/include/linux
-		EOF
-	fi
-}
-
-src_install() {
-	einfo "Copying files"
-	dodir ${INSTALL_DIR}
-	cp -pPR \
-		"${S}"/${INSTALL_DIR}/* \
-		"${D}"/${INSTALL_DIR}/ \
-		|| die "Copying ${PN} failed"
-
-	local env_file=05${PN}
-	cat > ${env_file} <<-EOF
-		PATH=${INSTALL_DIR}/bin
-		ROOTPATH=${INSTALL_DIR}/bin
-		LDPATH=${INSTALL_DIR}/lib
-		MANPATH=${INSTALL_DIR}/man
-	EOF
-	doenvd ${env_file} || die "doenvd ${env_file} failed"
-}
-
-pkg_postinst () {
-	# remove left over from unpacking
-	rm -f "${ROOT}"/opt/intel/{intel_sdp_products.db,.*.log} \
-		|| die "remove logs failed"
-
-	elog "Make sure you have recieved the a license for ${PN},"
-	elog "you cannot run ${PN} without a license file."
-	elog "To receive a non-commercial license, you need to register."
-	elog "Read the website for more information on this license:"
-	elog "${HOMEPAGE}"
-	elog "Then put the license file into ${ROOT}/opt/intel/licenses."
-	elog "\nTo use ${PN} issue first \n\tsource ${ROOT}/etc/profile"
-	elog "Debugger is installed with dev-lang/idb"
-}
diff --git a/dev-lang/icc/icc-11.1.046-r2.ebuild b/dev-lang/icc/icc-11.1.046-r2.ebuild
deleted file mode 100644
index a76325cfa5d7..000000000000
--- a/dev-lang/icc/icc-11.1.046-r2.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2010 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-r2.ebuild,v 1.3 2010/07/28 13:05:36 flameeyes Exp $
-
-EAPI="2"
-
-inherit toolchain-funcs
-
-PID=1536
-PB=cproc
-DESCRIPTION="Intel C/C++ optimized compiler for Linux"
-HOMEPAGE="http://www.intel.com/software/products/compilers/clin/"
-
-###
-# everything below common to ifc and icc
-# no eclass: very likely to change for next versions
-###
-PACKAGEID="l_${PB}_p_${PV}"
-RELEASE="${PV:0:4}"
-BUILD="${PV:5:8}"
-SRC_URI="http://registrationcenter-download.intel.com/irc_nas/${PID}/${PACKAGEID}.tgz"
-#SRC_URI="amd64? ( http://registrationcenter-download.intel.com/irc_nas/${PID}/${PACKAGEID}_intel64.tgz )
-#	ia64? ( http://registrationcenter-download.intel.com/irc_nas/${PID}/${PACKAGEID}_ia64.tgz )
-#	x86?  ( http://registrationcenter-download.intel.com/irc_nas/${PID}/${PACKAGEID}_ia32.tgz )"
-
-LICENSE="Intel-SDP"
-SLOT="0"
-IUSE=""
-KEYWORDS="~amd64 ~ia64"
-
-RESTRICT="mirror strip"
-
-INSTALL_DIR="opt/intel/Compiler/${RELEASE}/${BUILD}"
-# these don't work, not sure why
-#QA_TEXTRELS="${INSTALL_DIR}"
-#QA_WX_LOAD="${INSTALL_DIR}"
-#QA_PRESTRIPPED="${INSTALL_DIR}"
-
-DEPEND="app-arch/rpm"
-RDEPEND="~virtual/libstdc++-3.3
-	amd64? ( app-emulation/emul-linux-x86-compat )"
-
-S="${WORKDIR}/${PACKAGEID}"
-
-src_prepare() {
-	use amd64 || rm -f rpm/*x86_64.rpm
-	# debugger installed with dev-lang/idb
-	rm -f rpm/intel*idb*.rpm
-	# performance primitives installed with sci-libs/ipp
-	rm -f rpm/intel*ipp*.rpm
-	# math library installed with sci-libs/mkl
-	rm -f rpm/intel*mkl*.rpm
-}
-
-src_install() {
-	mkdir "${WORKDIR}/rpmdb"
-	# rpm open_wr's / but doesn't seem to do anything with it
-	addpredict /
-	rpm --install --nodeps --dbpath "${WORKDIR}/rpmdb" --prefix "${D}/${INSTALL_DIR}" rpm/*.rpm || die
-
-	find "${D}/${INSTALL_DIR}" -name '*.csh' | xargs sed -i "s|${D}|${ROOT}|" || die
-	find "${D}/${INSTALL_DIR}" -name '*.sh' | xargs sed -i "s|${D}|${ROOT}|" || die
-
-	ENV_FILE=05${PN}
-	MYARCH=""
-	if use amd64; then MYARCH=intel64; fi
-	if use ia64; then MYARCH=ia64; fi
-	if use x86; then MYARCH=ia32; fi
-
-	# 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
-
-	doenvd ${ENV_FILE} || die
-
-	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"
-	elog "Read the website for more information on this license."
-	elog "Install the license file into ${ROOT}opt/intel/licenses"
-	elog
-	elog "The following packages provide components bundled with icc:"
-	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
-}
diff --git a/dev-lang/icc/icc-11.1.056-r1.ebuild b/dev-lang/icc/icc-11.1.056-r1.ebuild
deleted file mode 100644
index afa7bbf3aa56..000000000000
--- a/dev-lang/icc/icc-11.1.056-r1.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2010 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-r1.ebuild,v 1.8 2010/12/03 18:46:33 patrick Exp $
-
-EAPI="3"
-
-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 ~ia64 ~x86 ~amd64-linux ~x86-linux"
-
-RESTRICT="mirror strip"
-
-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 "${EROOT}${f}" /usr/$(get_libdir)/eclipse-${ECLIPSE_V}/plugins
-	done
-
-	for f in "${DESTINATION}/eclipse_support/cdt${CDT_V}/eclipse/features"/*; do
-		dosym "${EROOT}${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|@${EROOT}${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/*/*
-	# remove for collision (bug #288038)
-	has_version "~dev-lang/ifc-${PV}" && \
-		rm -f ${DESTINATION}/lib/*/locale/*/flexnet.cat
-}
-
-src_install() {
-	einfo "Tagging"
-	. ./tag.sh
-	UNTAG_CFG_FILES
-
-	keepdir /opt/intel/licenses
-	einfo "Copying files"
-	dodir "/${DESTINATION}"
-	cp -pPR \
-		${DESTINATION}/* \
-		"${ED}"/${DESTINATION}/ \
-		|| die "Copying ${PN} failed"
-
-	local envf=05icfc
-	cat > ${envf} <<-EOF
-		PATH="${EROOT}${DESTINATION}/bin/${IARCH}"
-		ROOTPATH="${EROOT}${DESTINATION}/bin/${IARCH}"
-		LDPATH="${EROOT}${DESTINATION}/lib/${IARCH}"
-		LIBRARY_PATH="${EROOT}${DESTINATION}/lib/${IARCH}"
-		NLSPATH="${EROOT}${DESTINATION}/lib/locale/en_US/%N"
-		MANPATH="${EROOT}${DESTINATION}/man/en_US"
-	EOF
-	if [[ ! -e "${EROOT}"etc/env.d/${envf} ]] ||
-		[[ -n $(diff "${EROOT}"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 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 ${EROOT}opt/intel/licenses."
-}
diff --git a/dev-lang/icc/icc-11.1.056.ebuild b/dev-lang/icc/icc-11.1.056.ebuild
deleted file mode 100644
index 55e98943eae8..000000000000
--- a/dev-lang/icc/icc-11.1.056.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2010 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.9 2010/12/03 18:46:33 patrick 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 ~ia64 ~x86"
-
-RESTRICT="mirror strip"
-
-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/*/*
-	# remove for collision (bug #288038)
-	has_version "~dev-lang/ifc-${PV}" && \
-		rm -f ${DESTINATION}/lib/*/locale/*/flexnet.cat
-}
-
-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 [[ ! -e "${ROOT}"etc/env.d/${envf} ]] ||
-		[[ -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 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/icc-11.1.072-r1.ebuild b/dev-lang/icc/icc-11.1.072-r1.ebuild
index 0289350d9166..0e81a4680659 100644
--- a/dev-lang/icc/icc-11.1.072-r1.ebuild
+++ b/dev-lang/icc/icc-11.1.072-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/icc-11.1.072-r1.ebuild,v 1.2 2010/12/03 18:46:33 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/icc-11.1.072-r1.ebuild,v 1.3 2012/02/12 23:20:14 bicatali Exp $
 
 EAPI="3"
 
@@ -66,8 +66,8 @@ src_unpack() {
 	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
+		use idb && has_version dev-lang/ifc[idb] && rm -f rpm/*idb*.rpm
+		use mkl && has_version dev-lang/ifc[mkl] && rm -f rpm/*mkl*.rpm
 	fi
 	for x in rpm/intel*.rpm; do
 		einfo "Extracting $(basename ${x})..."
diff --git a/dev-lang/icc/icc-11.1.072.ebuild b/dev-lang/icc/icc-11.1.072.ebuild
deleted file mode 100644
index 0018181905ee..000000000000
--- a/dev-lang/icc/icc-11.1.072.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/icc-11.1.072.ebuild,v 1.4 2010/12/03 18:46:33 patrick Exp $
-
-EAPI="3"
-
-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=1768
-
-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 ~ia64 ~x86 ~amd64-linux ~x86-linux"
-
-RESTRICT="mirror strip"
-
-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 "${EROOT}${f}" /usr/$(get_libdir)/eclipse-${ECLIPSE_V}/plugins
-	done
-
-	for f in "${DESTINATION}/eclipse_support/cdt${CDT_V}/eclipse/features"/*; do
-		dosym "${EROOT}${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|@${EROOT}${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/*/*
-	# remove for collision (bug #288038)
-	has_version "~dev-lang/ifc-${PV}" && \
-		rm -f ${DESTINATION}/lib/*/locale/*/flexnet.cat
-}
-
-src_install() {
-	einfo "Tagging"
-	. ./tag.sh
-	UNTAG_CFG_FILES
-
-	keepdir /opt/intel/licenses
-	einfo "Copying files"
-	dodir "/${DESTINATION}"
-	cp -pPR \
-		${DESTINATION}/* \
-		"${ED}"/${DESTINATION}/ \
-		|| die "Copying ${PN} failed"
-
-	local envf=05icfc
-	cat > ${envf} <<-EOF
-		PATH="${EROOT}${DESTINATION}/bin/${IARCH}"
-		ROOTPATH="${EROOT}${DESTINATION}/bin/${IARCH}"
-		LDPATH="${EROOT}${DESTINATION}/lib/${IARCH}"
-		LIBRARY_PATH="${EROOT}${DESTINATION}/lib/${IARCH}"
-		NLSPATH="${EROOT}${DESTINATION}/lib/locale/en_US/%N"
-		MANPATH="${EROOT}${DESTINATION}/man/en_US"
-	EOF
-	if [[ ! -e "${EROOT}"etc/env.d/${envf} ]] ||
-		[[ -n $(diff "${EROOT}"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 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 ${EROOT}opt/intel/licenses."
-}