Removed obsoletes

(Portage version: 2.1.10.41/cvs/Linux x86_64)

8 files changed, 11 insertions, 803 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/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."
-}