big cleanup of old versions (including package masked). Insults to caleb@gentoo.org

(Portage version: 2.1.2.1)

49 files changed, 26 insertions, 1966 deletions

diff --git a/dev-lang/icc/ChangeLog b/dev-lang/icc/ChangeLog
index e48febd830fe..b84d5a51b716 100644
--- a/dev-lang/icc/ChangeLog
+++ b/dev-lang/icc/ChangeLog
@@ -1,6 +1,31 @@
 # ChangeLog for dev-lang/icc
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/ChangeLog,v 1.37 2007/01/01 15:32:24 drizzt Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/ChangeLog,v 1.38 2007/03/05 16:11:20 caleb Exp $
+
+  05 Mar 2007; Caleb Tennis <caleb@gentoo.org> -files/7.0.065-r1/05icc-ifc,
+  -files/7.0.065-r1/icc, -files/7.0.065-r2/05icc-ifc, -files/7.0.065-r2/icc,
+  -files/7.0.065/icc, -files/9.0.023/05icc-ifc, -files/9.0.023/icc,
+  -files/9.0.023/iccifc.conf, -files/9.0.023/icpc, -files/9.0.030/05icc-ifc,
+  -files/9.0.030/icc, -files/9.0.030/icpc, -files/9.1.044/05icc-ifc,
+  -files/9.1.044/icc, -files/6.0-r1/05icc-ifc, -files/6.0/05icc,
+  -files/7.0.065/05icc-ifc, -files/9.1.044/icpc, -icc-6.0.ebuild,
+  -icc-6.0-r1.ebuild, -icc-7.0.065.ebuild, -icc-7.0.065-r1.ebuild,
+  -icc-7.0.065-r2.ebuild, -icc-7.1.006.ebuild, -icc-7.1.029.ebuild,
+  -icc-7.1.030.ebuild, -icc-8.0.055.ebuild, -icc-8.1.028.ebuild,
+  -icc-9.0.021.ebuild, -icc-9.0.023.ebuild, -icc-9.0.030.ebuild,
+  -icc-9.1.042.ebuild, -icc-9.1.044.ebuild:
+  removing more versions
+
+  05 Mar 2007; Caleb Tennis <caleb@gentoo.org> -files/7.0.065-r1/05icc-ifc,
+  -files/7.0.065-r1/icc, -files/7.0.065-r2/05icc-ifc,
+  -files/6.0-r1/05icc-ifc, -files/7.0.065-r2/icc, -files/7.0.065/05icc-ifc,
+  -files/6.0/05icc, -files/7.0.065/icc, -icc-6.0.ebuild, -icc-6.0-r1.ebuild,
+  -icc-7.0.065.ebuild, -icc-7.0.065-r1.ebuild, -icc-7.0.065-r2.ebuild,
+  -icc-9.0.023.ebuild:
+  removing other old package masked versions
+
+  05 Mar 2007; Caleb Tennis <caleb@gentoo.org> -icc-9.0.023.ebuild:
+  removing an old masked version
 
   01 Jan 2007; Timothy Redaelli <drizzt@gentoo.org> icc-9.1.045.ebuild:
   Added virtual/libstdc++ to RDEPENDS, acknowledged by Kugelfang.
diff --git a/dev-lang/icc/files/6.0-r1/05icc-ifc b/dev-lang/icc/files/6.0-r1/05icc-ifc
deleted file mode 100644
index f5f50b9cc29f..000000000000
--- a/dev-lang/icc/files/6.0-r1/05icc-ifc
+++ /dev/null
@@ -1,6 +0,0 @@
-IA32ROOT=/opt/intel/compiler60/ia32
-INTEL_FLEXLM_LICENSE=/opt/intel/licenses
-LDPATH=/opt/intel/compiler60/ia32/lib
-MANPATH=/opt/intel/compiler60/man
-PATH=/opt/intel/compiler60/ia32/bin
-ROOTPATH=/opt/intel/compiler60/ia32/bin
diff --git a/dev-lang/icc/files/6.0/05icc b/dev-lang/icc/files/6.0/05icc
deleted file mode 100644
index f5f50b9cc29f..000000000000
--- a/dev-lang/icc/files/6.0/05icc
+++ /dev/null
@@ -1,6 +0,0 @@
-IA32ROOT=/opt/intel/compiler60/ia32
-INTEL_FLEXLM_LICENSE=/opt/intel/licenses
-LDPATH=/opt/intel/compiler60/ia32/lib
-MANPATH=/opt/intel/compiler60/man
-PATH=/opt/intel/compiler60/ia32/bin
-ROOTPATH=/opt/intel/compiler60/ia32/bin
diff --git a/dev-lang/icc/files/7.0.065-r1/05icc-ifc b/dev-lang/icc/files/7.0.065-r1/05icc-ifc
deleted file mode 100644
index 7134ac814afd..000000000000
--- a/dev-lang/icc/files/7.0.065-r1/05icc-ifc
+++ /dev/null
@@ -1,6 +0,0 @@
-IA32ROOT=/opt/intel/compiler70/ia32
-INTEL_FLEXLM_LICENSE=/opt/intel/licenses
-LDPATH=/opt/intel/compiler70/ia32/lib
-MANPATH=/opt/intel/compiler70/man
-PATH=/opt/intel/compiler70/ia32/bin
-ROOTPATH=/opt/intel/compiler70/ia32/bin
diff --git a/dev-lang/icc/files/7.0.065-r1/icc b/dev-lang/icc/files/7.0.065-r1/icc
deleted file mode 100644
index 6d53c6dc0c69..000000000000
--- a/dev-lang/icc/files/7.0.065-r1/icc
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-export INTEL_LICENSE_FILE="/opt/intel/licenses"
-export LD_LIBRARY_PATH="/opt/intel/compiler70/ia32/lib"
-
-ICCARGS=`echo $* | sed -e s:pentium2:pentiumii:g | sed -e s:pentium3:pentiumiii:g`
-
-/opt/intel/compiler70/ia32/bin/iccbin $ICCARGS
diff --git a/dev-lang/icc/files/7.0.065-r2/05icc-ifc b/dev-lang/icc/files/7.0.065-r2/05icc-ifc
deleted file mode 100644
index 20c18a04bf99..000000000000
--- a/dev-lang/icc/files/7.0.065-r2/05icc-ifc
+++ /dev/null
@@ -1,7 +0,0 @@
-IA32ROOT=/opt/intel/compiler70/ia32
-INTEL_FLEXLM_LICENSE=/opt/intel/licenses
-INTEL_LICENSE_FILE=/opt/intel/licenses
-LDPATH=/opt/intel/compiler70/ia32/lib
-MANPATH=/opt/intel/compiler70/man
-PATH=/opt/intel/compiler70/ia32/bin
-ROOTPATH=/opt/intel/compiler70/ia32/bin
diff --git a/dev-lang/icc/files/7.0.065-r2/icc b/dev-lang/icc/files/7.0.065-r2/icc
deleted file mode 100644
index 6d53c6dc0c69..000000000000
--- a/dev-lang/icc/files/7.0.065-r2/icc
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-export INTEL_LICENSE_FILE="/opt/intel/licenses"
-export LD_LIBRARY_PATH="/opt/intel/compiler70/ia32/lib"
-
-ICCARGS=`echo $* | sed -e s:pentium2:pentiumii:g | sed -e s:pentium3:pentiumiii:g`
-
-/opt/intel/compiler70/ia32/bin/iccbin $ICCARGS
diff --git a/dev-lang/icc/files/7.0.065/05icc-ifc b/dev-lang/icc/files/7.0.065/05icc-ifc
deleted file mode 100644
index 7134ac814afd..000000000000
--- a/dev-lang/icc/files/7.0.065/05icc-ifc
+++ /dev/null
@@ -1,6 +0,0 @@
-IA32ROOT=/opt/intel/compiler70/ia32
-INTEL_FLEXLM_LICENSE=/opt/intel/licenses
-LDPATH=/opt/intel/compiler70/ia32/lib
-MANPATH=/opt/intel/compiler70/man
-PATH=/opt/intel/compiler70/ia32/bin
-ROOTPATH=/opt/intel/compiler70/ia32/bin
diff --git a/dev-lang/icc/files/7.0.065/icc b/dev-lang/icc/files/7.0.065/icc
deleted file mode 100644
index 5c4905d8b461..000000000000
--- a/dev-lang/icc/files/7.0.065/icc
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-export INTEL_LICENSE_FILE="/opt/intel/licenses"
-export LD_LIBRARY_PATH="/opt/intel/compiler70/ia32/lib"
-/opt/intel/compiler70/ia32/bin/iccbin $*
diff --git a/dev-lang/icc/files/9.0.023/05icc-ifc b/dev-lang/icc/files/9.0.023/05icc-ifc
deleted file mode 100644
index 236ca7ef56e0..000000000000
--- a/dev-lang/icc/files/9.0.023/05icc-ifc
+++ /dev/null
@@ -1,6 +0,0 @@
-IA32ROOT=/opt/intel/compiler90
-INTEL_FLEXLM_LICENSE=/opt/intel/compiler90/licenses
-LDPATH=/opt/intel/compiler90/lib
-MANPATH=/opt/intel/compiler90/man
-PATH=/opt/intel/compiler90/bin
-ROOTPATH=/opt/intel/compiler90/bin
diff --git a/dev-lang/icc/files/9.0.023/icc b/dev-lang/icc/files/9.0.023/icc
deleted file mode 100644
index e9ba0b9c107c..000000000000
--- a/dev-lang/icc/files/9.0.023/icc
+++ /dev/null
@@ -1,10 +0,0 @@
-#! /bin/sh
-#
-# Gentoo-specific wrapper script for the Intel C/C++ compilers
-#
-# Maintainer: Karl Trygve Kalleberg <karltk@gentoo.org>
-#
-
-export INTEL_LICENSE_FILE="/opt/intel/compiler90/licenses"
-export LD_LIBRARY_PATH="/opt/intel/compiler90/lib"
-/opt/intel/compiler90/bin/iccbin $*
diff --git a/dev-lang/icc/files/9.0.023/iccifc.conf b/dev-lang/icc/files/9.0.023/iccifc.conf
deleted file mode 100644
index 4f5d6789c65d..000000000000
--- a/dev-lang/icc/files/9.0.023/iccifc.conf
+++ /dev/null
@@ -1,29 +0,0 @@
-#This file is used to set global (hopefully) compiler variables for the 
-#Intel ICC and IFC compilers.  The ICFLAGS and ICCFLAGS are the 
-#equivalents of the CFLAGS and CXXFLAGS - specific for ICC & IFC.
-
-#Note that the following flags are currently considered to be rather
-#problematic, and you may experience significant difficulty in emerges
-#with these flags
-#
-# -ip -ipo -ipo_obj -static -fast -cxxlib-gcc
-#
-
-#The following settings are a good starting point for Pentium 4 owners.
-#Pentium 3 owners should replace -xN with -xK
-#Pentium M owners should replace -xN with -xB
-#Prescott owners should replace -xN with -xP
-
-ICFLAGS = "-O2 -xN -noalign"
-ICXXFLAGS = "${ICFLAGS}"
-IFCFLAGS = "${ICFLAGS}"
-
-#The following variables define the compilers and linkers
-
-ICC = "icc"
-ICXX = "icpc"
-ICPP = "${ICC} -E"
-ICXXCPP = "${ICXX} -E"
-IFC = "ifc"
-ILD = "xild"
-IAR = "xiar"
diff --git a/dev-lang/icc/files/9.0.023/icpc b/dev-lang/icc/files/9.0.023/icpc
deleted file mode 100644
index f03dddfc7906..000000000000
--- a/dev-lang/icc/files/9.0.023/icpc
+++ /dev/null
@@ -1,10 +0,0 @@
-#! /bin/sh
-#
-# Gentoo-specific wrapper script for Intel C/C++ compiler suite
-#
-# Maintainer: Karl Trygve Kalleberg <karltk@gentoo.org>
-#
-
-export INTEL_LICENSE_FILE="/opt/intel/compiler90/licenses"
-export LD_LIBRARY_PATH="/opt/intel/compiler90/lib"
-/opt/intel/compiler90/bin/icpcbin $*
diff --git a/dev-lang/icc/files/9.0.030/05icc-ifc b/dev-lang/icc/files/9.0.030/05icc-ifc
deleted file mode 100644
index 236ca7ef56e0..000000000000
--- a/dev-lang/icc/files/9.0.030/05icc-ifc
+++ /dev/null
@@ -1,6 +0,0 @@
-IA32ROOT=/opt/intel/compiler90
-INTEL_FLEXLM_LICENSE=/opt/intel/compiler90/licenses
-LDPATH=/opt/intel/compiler90/lib
-MANPATH=/opt/intel/compiler90/man
-PATH=/opt/intel/compiler90/bin
-ROOTPATH=/opt/intel/compiler90/bin
diff --git a/dev-lang/icc/files/9.0.030/icc b/dev-lang/icc/files/9.0.030/icc
deleted file mode 100644
index e9ba0b9c107c..000000000000
--- a/dev-lang/icc/files/9.0.030/icc
+++ /dev/null
@@ -1,10 +0,0 @@
-#! /bin/sh
-#
-# Gentoo-specific wrapper script for the Intel C/C++ compilers
-#
-# Maintainer: Karl Trygve Kalleberg <karltk@gentoo.org>
-#
-
-export INTEL_LICENSE_FILE="/opt/intel/compiler90/licenses"
-export LD_LIBRARY_PATH="/opt/intel/compiler90/lib"
-/opt/intel/compiler90/bin/iccbin $*
diff --git a/dev-lang/icc/files/9.0.030/icpc b/dev-lang/icc/files/9.0.030/icpc
deleted file mode 100644
index f03dddfc7906..000000000000
--- a/dev-lang/icc/files/9.0.030/icpc
+++ /dev/null
@@ -1,10 +0,0 @@
-#! /bin/sh
-#
-# Gentoo-specific wrapper script for Intel C/C++ compiler suite
-#
-# Maintainer: Karl Trygve Kalleberg <karltk@gentoo.org>
-#
-
-export INTEL_LICENSE_FILE="/opt/intel/compiler90/licenses"
-export LD_LIBRARY_PATH="/opt/intel/compiler90/lib"
-/opt/intel/compiler90/bin/icpcbin $*
diff --git a/dev-lang/icc/files/9.1.044/05icc-ifc b/dev-lang/icc/files/9.1.044/05icc-ifc
deleted file mode 100644
index 838b25165f4e..000000000000
--- a/dev-lang/icc/files/9.1.044/05icc-ifc
+++ /dev/null
@@ -1,7 +0,0 @@
-IA32ROOT=/opt/intel/compiler91
-INTEL_FLEXLM_LICENSE=/opt/intel/compiler91/licenses
-LDPATH=/opt/intel/compiler91/lib
-MANPATH=/opt/intel/compiler91/man
-PATH=/opt/intel/compiler91/bin
-ROOTPATH=/opt/intel/compiler91/bin
-
diff --git a/dev-lang/icc/files/9.1.044/icc b/dev-lang/icc/files/9.1.044/icc
deleted file mode 100644
index c9cfd8d38086..000000000000
--- a/dev-lang/icc/files/9.1.044/icc
+++ /dev/null
@@ -1,10 +0,0 @@
-#! /bin/sh
-#
-# Gentoo-specific wrapper script for the Intel C/C++ compilers
-#
-# Maintainer: Karl Trygve Kalleberg <karltk@gentoo.org>
-#
-
-export INTEL_LICENSE_FILE="/opt/intel/compiler91/licenses"
-export LD_LIBRARY_PATH="/opt/intel/compiler91/lib"
-/opt/intel/compiler91/bin/iccbin $*
diff --git a/dev-lang/icc/files/9.1.044/icpc b/dev-lang/icc/files/9.1.044/icpc
deleted file mode 100644
index 728e244c585d..000000000000
--- a/dev-lang/icc/files/9.1.044/icpc
+++ /dev/null
@@ -1,10 +0,0 @@
-#! /bin/sh
-#
-# Gentoo-specific wrapper script for Intel C/C++ compiler suite
-#
-# Maintainer: Karl Trygve Kalleberg <karltk@gentoo.org>
-#
-
-export INTEL_LICENSE_FILE="/opt/intel/compiler91/licenses"
-export LD_LIBRARY_PATH="/opt/intel/compiler91/lib"
-/opt/intel/compiler91/bin/icpcbin $*
diff --git a/dev-lang/icc/files/digest-icc-6.0 b/dev-lang/icc/files/digest-icc-6.0
deleted file mode 100644
index 6f88b8077df2..000000000000
--- a/dev-lang/icc/files/digest-icc-6.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a8143725154434763b32926f8aca2473 l_cc_p_6.0.139.tar 40775680
diff --git a/dev-lang/icc/files/digest-icc-6.0-r1 b/dev-lang/icc/files/digest-icc-6.0-r1
deleted file mode 100644
index 6f88b8077df2..000000000000
--- a/dev-lang/icc/files/digest-icc-6.0-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a8143725154434763b32926f8aca2473 l_cc_p_6.0.139.tar 40775680
diff --git a/dev-lang/icc/files/digest-icc-7.0.065 b/dev-lang/icc/files/digest-icc-7.0.065
deleted file mode 100644
index 26c60237a081..000000000000
--- a/dev-lang/icc/files/digest-icc-7.0.065
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e16414a571ac8cc9b69fad3a886049f1 l_cc_p_7.0.065.tar 64921600
diff --git a/dev-lang/icc/files/digest-icc-7.0.065-r1 b/dev-lang/icc/files/digest-icc-7.0.065-r1
deleted file mode 100644
index 26c60237a081..000000000000
--- a/dev-lang/icc/files/digest-icc-7.0.065-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e16414a571ac8cc9b69fad3a886049f1 l_cc_p_7.0.065.tar 64921600
diff --git a/dev-lang/icc/files/digest-icc-7.0.065-r2 b/dev-lang/icc/files/digest-icc-7.0.065-r2
deleted file mode 100644
index 26c60237a081..000000000000
--- a/dev-lang/icc/files/digest-icc-7.0.065-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e16414a571ac8cc9b69fad3a886049f1 l_cc_p_7.0.065.tar 64921600
diff --git a/dev-lang/icc/files/digest-icc-7.1.006 b/dev-lang/icc/files/digest-icc-7.1.006
deleted file mode 100644
index 8b5e6fc57872..000000000000
--- a/dev-lang/icc/files/digest-icc-7.1.006
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f1f00b6a3a788b82ea171126ca37f62d l_cc_p_7.1.006.tar 63406080
diff --git a/dev-lang/icc/files/digest-icc-7.1.029 b/dev-lang/icc/files/digest-icc-7.1.029
deleted file mode 100644
index 54e45bb10142..000000000000
--- a/dev-lang/icc/files/digest-icc-7.1.029
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6449cce3173fb91273a224be34353b5b l_cc_pc_7.1.029.tar 75991040
diff --git a/dev-lang/icc/files/digest-icc-7.1.030 b/dev-lang/icc/files/digest-icc-7.1.030
deleted file mode 100644
index 54d11d9ba37a..000000000000
--- a/dev-lang/icc/files/digest-icc-7.1.030
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7124e0ab49d8908d47150ce95617d7ce l_cc_pc_7.1.030.tar 76042240
diff --git a/dev-lang/icc/files/digest-icc-8.0.055 b/dev-lang/icc/files/digest-icc-8.0.055
deleted file mode 100644
index 4d6e8fd0d537..000000000000
--- a/dev-lang/icc/files/digest-icc-8.0.055
+++ /dev/null
@@ -1 +0,0 @@
-MD5 df3deb1b1cfe56cf64d1c7cd2e694805 l_cc_p_8.0.055.tar.gz 67399682
diff --git a/dev-lang/icc/files/digest-icc-8.1.028 b/dev-lang/icc/files/digest-icc-8.1.028
deleted file mode 100644
index 9d4d2954a190..000000000000
--- a/dev-lang/icc/files/digest-icc-8.1.028
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c731762ff850020e67856980d9919030 l_cc_pc_8.1.028.tar.gz 135460369
diff --git a/dev-lang/icc/files/digest-icc-9.0.021 b/dev-lang/icc/files/digest-icc-9.0.021
deleted file mode 100644
index fdbbe658dacc..000000000000
--- a/dev-lang/icc/files/digest-icc-9.0.021
+++ /dev/null
@@ -1 +0,0 @@
-MD5 48bec7969a1080619ced226da0e07fac l_cc_p_9.0.021.tar.gz 201217259
diff --git a/dev-lang/icc/files/digest-icc-9.0.023 b/dev-lang/icc/files/digest-icc-9.0.023
deleted file mode 100644
index 4b581aa02653..000000000000
--- a/dev-lang/icc/files/digest-icc-9.0.023
+++ /dev/null
@@ -1 +0,0 @@
-MD5 11aa20aa8671d0975361d29d507a6f6a l_cc_c_9.0.023.tar.gz 201405770
diff --git a/dev-lang/icc/files/digest-icc-9.0.030 b/dev-lang/icc/files/digest-icc-9.0.030
deleted file mode 100644
index 996d24b13b18..000000000000
--- a/dev-lang/icc/files/digest-icc-9.0.030
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 0c8901aafc4521771dc38593df5a4c4a l_cc_c_9.0.030.tar.gz 203844352
-RMD160 13a50630da7f14cc0e7a27254eb95b35d8bdc38f l_cc_c_9.0.030.tar.gz 203844352
-SHA256 a384c825f503ee6f94b97086948af951ea52c6d2d6f38c3a636c35b6948e321f l_cc_c_9.0.030.tar.gz 203844352
diff --git a/dev-lang/icc/files/digest-icc-9.1.042 b/dev-lang/icc/files/digest-icc-9.1.042
deleted file mode 100644
index 104423e56ba1..000000000000
--- a/dev-lang/icc/files/digest-icc-9.1.042
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 21a2abf2987bc4ab2eb8a9f54ed35d22 l_cc_c_9.1.042.tar.gz 292001591
-RMD160 06b7cba02eb8eb6489cab572d9dd9480076ee653 l_cc_c_9.1.042.tar.gz 292001591
-SHA256 1552c124227a460746bf24f9159bdfb3d3974d0069d415a2ae20d6d9dc20b8ed l_cc_c_9.1.042.tar.gz 292001591
diff --git a/dev-lang/icc/files/digest-icc-9.1.044 b/dev-lang/icc/files/digest-icc-9.1.044
deleted file mode 100644
index 2a093d144b1e..000000000000
--- a/dev-lang/icc/files/digest-icc-9.1.044
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 8a9df589a573cf975b17a53236238e4b l_cc_c_9.1.044.tar.gz 292700142
-RMD160 8895b76bf238bebb843c545e5cf9912e70b8ea87 l_cc_c_9.1.044.tar.gz 292700142
-SHA256 88f0b141e8fdf32022d094403f12950f3f8f82678535043b6edb0dfba94c0a3f l_cc_c_9.1.044.tar.gz 292700142
diff --git a/dev-lang/icc/icc-6.0-r1.ebuild b/dev-lang/icc/icc-6.0-r1.ebuild
deleted file mode 100644
index bcc77011c362..000000000000
--- a/dev-lang/icc/icc-6.0-r1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/icc-6.0-r1.ebuild,v 1.12 2004/07/14 13:39:33 agriffis Exp $
-
-S=${WORKDIR}
-
-DESCRIPTION="Intel C++ Compiler - The Pentium optimized compiler for Linux"
-
-#RESTRICT="fetch"
-
-SRC_URI1="http://developer.intel.com/software/products/compilers/downloads/l_cc_p_6.0.139.tar"
-SRC_URI2="ftp://download.intel.com/software/products/compilers/downloads/l_cc_p_6.0.139.tar"
-SRC_URI3="ftp://download.intel.co.jp/software/products/compilers/downloads/l_cc_p_6.0.139.tar"
-SRC_URI="${SRC_URI1} ${SRC_URI2} ${SRC_URI3}"
-
-HOMEPAGE="http://www.intel.com/software/products/compilers/clin/"
-
-LICENSE="icc-6.0"
-
-DEPEND="virtual/linux-sources
-		>=sys-libs/glibc-2.2.2
-		app-arch/cpio
-		app-arch/rpm"
-
-RDEPEND="virtual/linux-sources
-		>=sys-libs/glibc-2.2.2"
-
-SLOT="0"
-KEYWORDS="-* x86"
-IUSE=""
-
-src_compile() {
-	# Keep disk space to a minimum
-	rm -f intel-*.ia64.rpm
-
-	mkdir opt
-
-	for x in intel-*.i386.rpm
-	do
-		einfo "Extracting: ${x}"
-		rpm2cpio ${x} | cpio --extract --make-directories --unconditional
-	done
-
-	# From UNTAG_CFG_FILES in 'install'
-	SD=${S}/opt/intel # Build DESTINATION
-	RD=/opt/intel # Real DESTINATION
-	for FILE in $(find $SD/compiler60/ia??/bin/ -regex '.*[ei][cf]p?c$\|.*cfg$\|.*pcl$\|.*vars[^/]*.c?sh$' 2>/dev/null)
-	do
-		sed s@\<INSTALLDIR\>@$RD@g ${FILE} > ${FILE}.abs
-		mv -f ${FILE}.abs ${FILE}
-		chmod 755 ${FILE}
-	done
-
-	# From UNTAG_SUPPORT in 'install'
-	eval `grep "^[ ]*COMBOPACKAGEID=" install`
-
-	SUPPORTFILE=${SD}/compiler60/docs/csupport
-	sed s@\<INSTALLTIMECOMBOPACKAGEID\>@$COMBOPACKAGEID@g $SUPPORTFILE > $SUPPORTFILE.abs
-	mv $SUPPORTFILE.abs $SUPPORTFILE
-	chmod 644 $SUPPORTFILE
-
-	SUPPORTFILE=${SD}/compiler60/docs/ldbsupport
-	sed s@\<INSTALLTIMECOMBOPACKAGEID\>@$COMBOPACKAGEID@g $SUPPORTFILE > $SUPPORTFILE.abs
-	mv $SUPPORTFILE.abs $SUPPORTFILE
-	chmod 644 $SUPPORTFILE
-}
-
-src_install () {
-	dodoc lgpltext
-	dodoc clicense
-	cp -a opt ${D}
-
-	# icc enviroment
-	insinto /etc/env.d
-	doins ${FILESDIR}/${PVR}/05icc-ifc
-}
-
-pkg_postinst () {
-	einfo
-	einfo "http://www.intel.com/software/products/compilers/c60l/c60l_noncom_lic.htm"
-	einfo "From the above url you can get a free, non-time limited, non-commercial"
-	einfo "personal use license key that comes with no support. You will need to read"
-	einfo "and agree to the license and then fill in your info to have one emailed to"
-	einfo "you. Read the website for the details."
-	einfo
-	einfo "Documentation can be found in /opt/intel/compiler60/docs/ ."
-	einfo
-	einfo "You will need to place your license in /opt/intel/licenses/ ."
-	einfo
-	if [ -d /opt/intel/compiler50 ]
-	then
-		ewarn
-		ewarn "Packages compiled with icc-5 will need to be recompiled."
-		ewarn "Until you can do that the old packages will work if you edit /etc/ld.so.conf and"
-		ewarn "change the 'compiler60' to 'compiler50' and run 'ldconfig'. Note that this edit"
-		ewarn "won't persist and will require you to re-edit after each package you re-install."
-		ewarn
-		ewarn "I know it sucks, and I've complained to Intel with all the details."
-		ewarn
-	fi
-}
diff --git a/dev-lang/icc/icc-6.0.ebuild b/dev-lang/icc/icc-6.0.ebuild
deleted file mode 100644
index 6afdb49f32fd..000000000000
--- a/dev-lang/icc/icc-6.0.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/icc-6.0.ebuild,v 1.14 2004/07/14 13:39:33 agriffis Exp $
-
-S=${WORKDIR}
-
-DESCRIPTION="Intel C++ Compiler - The Pentium optimized compiler for Linux"
-
-#RESTRICT="fetch"
-
-SRC_URI1="http://developer.intel.com/software/products/compilers/downloads/l_cc_p_6.0.139.tar"
-SRC_URI2="ftp://download.intel.com/software/products/compilers/downloads/l_cc_p_6.0.139.tar"
-SRC_URI3="ftp://download.intel.co.jp/software/products/compilers/downloads/l_cc_p_6.0.139.tar"
-SRC_URI="${SRC_URI1} ${SRC_URI2} ${SRC_URI3}"
-
-HOMEPAGE="http://www.intel.com/software/products/compilers/clin/"
-
-LICENSE="icc-6.0"
-
-DEPEND="virtual/linux-sources
-		>=sys-libs/glibc-2.2.2
-		app-arch/cpio
-		app-arch/rpm"
-
-RDEPEND="virtual/linux-sources
-		>=sys-libs/glibc-2.2.2"
-
-SLOT="0"
-KEYWORDS="-* x86"
-IUSE=""
-
-src_compile() {
-	# Keep disk space to a minimum
-	rm -f intel-*.ia64.rpm
-
-	mkdir opt
-
-	for x in intel-*.i386.rpm
-	do
-		einfo "Extracting: ${x}"
-		rpm2cpio ${x} | cpio --extract --make-directories --unconditional
-	done
-
-	# From UNTAG_CFG_FILES in 'install'
-	SD=${S}/opt/intel # Build DESTINATION
-	RD=/opt/intel # Real DESTINATION
-	for FILE in $(find $SD/compiler60/ia??/bin/ -regex '.*[ei][cf]p?c$\|.*cfg$\|.*pcl$\|.*vars[^/]*.c?sh$' 2>/dev/null)
-	do
-		sed s@\<INSTALLDIR\>@$RD@g ${FILE} > ${FILE}.abs
-		mv -f ${FILE}.abs ${FILE}
-		chmod 755 ${FILE}
-	done
-
-	# From UNTAG_SUPPORT in 'install'
-	SUPPORTFILE=${SD}/compiler60/docs/csupport
-	eval `grep "^[ ]*COMBOPACKAGEID=" install`
-	sed s@\<INSTALLTIMECOMBOPACKAGEID\>@$COMBOPACKAGEID@g $SUPPORTFILE > $SUPPORTFILE.abs
-	mv $SUPPORTFILE.abs $SUPPORTFILE
-	chmod 644 $SUPPORTFILE
-}
-
-src_install () {
-	dodoc lgpltext
-	dodoc clicense
-	cp -a opt ${D}
-
-	# icc enviroment
-	insinto /etc/env.d
-	doins ${FILESDIR}/${PVR}/05icc
-}
-
-pkg_postinst () {
-	einfo
-	einfo "http://www.intel.com/software/products/compilers/c60l/c60l_noncom_lic.htm"
-	einfo "From the above url you can get a free, non-time limited, non-commercial"
-	einfo "personal use license key that comes with no support. You will need to read"
-	einfo "and agree to the license and then fill in your info to have one emailed to"
-	einfo "you. Read the website for the details."
-	einfo
-	einfo "Documentation can be found in /opt/intel/compiler60/docs/ ."
-	einfo
-	einfo "You will need to place your license in /opt/intel/licenses/ ."
-	einfo
-	if [ -d /opt/intel/compiler50 ]
-	then
-		ewarn
-		ewarn "Packages compiled with icc-5 will need to be recompiled."
-		ewarn "Until you can do that the old packages will work if you edit /etc/ld.so.conf and"
-		ewarn "change the 'compiler60' to 'compiler50' and run 'ldconfig'. Note that this edit"
-		ewarn "won't persist and will require you to re-edit after each package you re-install."
-		ewarn
-		ewarn "I know it sucks, and I've complained to Intel with all the details."
-		ewarn
-	fi
-}
diff --git a/dev-lang/icc/icc-7.0.065-r1.ebuild b/dev-lang/icc/icc-7.0.065-r1.ebuild
deleted file mode 100644
index a7e2fb5f8890..000000000000
--- a/dev-lang/icc/icc-7.0.065-r1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/icc-7.0.065-r1.ebuild,v 1.8 2004/06/24 22:50:29 agriffis Exp $
-
-S=${WORKDIR}
-
-DESCRIPTION="Intel C++ Compiler - The Pentium optimized compiler for Linux"
-
-SRC_URI1="ftp://download.intel.com/software/products/compilers/downloads/l_cc_p_7.0.065.tar"
-SRC_URI2="ftp://download.intel.co.jp/software/products/compilers/downloads/l_cc_p_7.0.065.tar"
-SRC_URI="${SRC_URI1} ${SRC_URI2}"
-
-HOMEPAGE="http://www.intel.com/software/products/compilers/clin/"
-
-LICENSE="icc-7.0"
-
-DEPEND="virtual/linux-sources
-		>=sys-libs/glibc-2.2.4
-		app-arch/cpio
-		app-arch/rpm"
-
-RDEPEND="virtual/linux-sources
-		>=sys-libs/glibc-2.2.4"
-
-SLOT="7"
-KEYWORDS="-* x86"
-IUSE=""
-
-src_compile() {
-	# Keep disk space to a minimum
-	rm -f intel-*.ia64.rpm
-
-	mkdir opt
-
-	for x in intel-*.i386.rpm
-	do
-		einfo "Extracting: ${x}"
-		rpm2cpio ${x} | cpio --extract --make-directories --unconditional
-	done
-
-	# From UNTAG_CFG_FILES in 'install'
-	SD=${S}/opt/intel # Build DESTINATION
-	RD=/opt/intel # Real DESTINATION
-	for FILE in $(find $SD/compiler*/ia??/bin/ -regex '.*[ei][cf]p?c$\|.*cfg$\|.*pcl$\|.*vars[^/]*.c?sh$' 2>/dev/null)
-	do
-		sed s@\<INSTALLDIR\>@$RD@g ${FILE} > ${FILE}.abs
-		mv -f ${FILE}.abs ${FILE}
-		chmod 755 ${FILE}
-	done
-
-	# From UNTAG_SUPPORT in 'install'
-	eval `grep "^[ ]*COMBOPACKAGEID=" install`
-
-	for SUPPORTFILE in ${SD}/compiler*/docs/*support
-	do
-		einfo "Untagging: ${SUPPORTFILE}"
-		sed s@\<INSTALLTIMECOMBOPACKAGEID\>@$COMBOPACKAGEID@g $SUPPORTFILE > $SUPPORTFILE.abs
-		mv $SUPPORTFILE.abs $SUPPORTFILE
-		chmod 644 $SUPPORTFILE
-	done
-}
-
-src_install () {
-	dodoc lgpltext
-	dodoc clicense
-	cp -a opt ${D}
-
-	# icc enviroment
-	insinto /etc/env.d
-	doins ${FILESDIR}/${PVR}/05icc-ifc
-	# fix the issue with the primary icc executable
-	exeinto /opt/intel/compiler70/ia32/bin
-	doexe ${FILESDIR}/${PVR}/icc
-}
-
-pkg_postinst () {
-	einfo
-	einfo "http://www.intel.com/software/products/compilers/clin/noncom.htm"
-	einfo "From the above url you can get a free, non-commercial"
-	einfo "license to use the Intel C++ Compiler emailed to you."
-	einfo "You cannot run icc without this license file."
-	einfo "Read the website for more information on this license."
-	einfo
-	einfo "Documentation can be found in /opt/intel/compiler70/docs/"
-	einfo
-	einfo "You will need to place your license in /opt/intel/licenses/"
-	einfo
-		ewarn
-		ewarn "Packages compiled with older versions of icc will need"
-		ewarn "to be recompiled. Until you do that, old packages will"
-		ewarn "work if you edit /etc/ld.so.conf and change 'compiler70'"
-		ewarn "to 'compiler60' and run 'ldconfig.' Note that this edit"
-		ewarn "won't persist and will require you to re-edit after each"
-		ewarn "package you re-install."
-	ewarn "If 'icc' breaks, use 'iccbin' instead and report a bug."
-	ewarn "NOTE: Before compiling important applications that your system"
-	ewarn "depends on, read the warning above. This could potentially"
-	ewarn "render your system unusable. This is a problem with Intel's"
-	ewarn "software, _not_ with Gentoo."
-	ewarn "Please use 'source /etc/profile' prior to merging any icc-enabled"
-	ewarn "ebuilds."
-}
diff --git a/dev-lang/icc/icc-7.0.065-r2.ebuild b/dev-lang/icc/icc-7.0.065-r2.ebuild
deleted file mode 100644
index 1538d22b5141..000000000000
--- a/dev-lang/icc/icc-7.0.065-r2.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/icc-7.0.065-r2.ebuild,v 1.9 2004/06/24 22:50:29 agriffis Exp $
-
-S=${WORKDIR}
-
-DESCRIPTION="Intel C++ Compiler - Intel's Pentium optimized compiler for Linux"
-
-SRC_URI1="ftp://download.intel.com/software/products/compilers/downloads/l_cc_p_7.0.065.tar"
-SRC_URI2="ftp://download.intel.co.jp/software/products/compilers/downloads/l_cc_p_7.0.065.tar"
-SRC_URI="${SRC_URI1} ${SRC_URI2}"
-
-HOMEPAGE="http://www.intel.com/software/products/compilers/clin/"
-
-LICENSE="icc-7.0"
-
-DEPEND="virtual/linux-sources
-		>=sys-libs/glibc-2.2.4
-		app-arch/cpio
-		app-arch/rpm"
-
-RDEPEND="virtual/linux-sources
-		>=sys-libs/glibc-2.2.4"
-
-SLOT="7"
-KEYWORDS="-* x86"
-IUSE=""
-
-src_compile() {
-	# Keep disk space to a minimum
-	rm -f intel-*.ia64.rpm
-
-	mkdir opt
-
-	for x in intel-*.i386.rpm
-	do
-		einfo "Extracting: ${x}"
-		rpm2cpio ${x} | cpio --extract --make-directories --unconditional
-	done
-
-	# From UNTAG_CFG_FILES in 'install'
-	SD=${S}/opt/intel # Build DESTINATION
-	RD=/opt/intel # Real DESTINATION
-	for FILE in $(find $SD/compiler*/ia??/bin/ -regex '.*[ei][cf]p?c$\|.*cfg$\|.*pcl$\|.*vars[^/]*.c?sh$' 2>/dev/null)
-	do
-		sed s@\<INSTALLDIR\>@$RD@g ${FILE} > ${FILE}.abs
-		mv -f ${FILE}.abs ${FILE}
-		chmod 755 ${FILE}
-	done
-
-	# From UNTAG_SUPPORT in 'install'
-	eval `grep "^[ ]*COMBOPACKAGEID=" install`
-
-	for SUPPORTFILE in ${SD}/compiler*/docs/*support
-	do
-		einfo "Untagging: ${SUPPORTFILE}"
-		sed s@\<INSTALLTIMECOMBOPACKAGEID\>@$COMBOPACKAGEID@g $SUPPORTFILE > $SUPPORTFILE.abs
-		mv $SUPPORTFILE.abs $SUPPORTFILE
-		chmod 644 $SUPPORTFILE
-	done
-}
-
-src_install () {
-	dodoc lgpltext
-	dodoc clicense
-	cp -a opt ${D}
-
-	# icc enviroment
-	insinto /etc/env.d
-	doins ${FILESDIR}/${PVR}/05icc-ifc
-	# fix the issue with the primary icc executable
-	exeinto /opt/intel/compiler70/ia32/bin
-	doexe ${FILESDIR}/${PVR}/icc
-}
-
-pkg_postinst () {
-	einfo
-	einfo "http://www.intel.com/software/products/compilers/clin/noncom.htm"
-	einfo "From the above url you can get a free, non-commercial"
-	einfo "license to use the Intel C++ Compiler emailed to you."
-	einfo "You cannot run icc without this license file."
-	einfo "Read the website for more information on this license."
-	einfo
-	einfo "Documentation can be found in /opt/intel/compiler70/docs/"
-	einfo
-	einfo "You will need to place your license in /opt/intel/licenses/"
-	einfo
-		ewarn
-		ewarn "Packages compiled with older versions of icc will need"
-		ewarn "to be recompiled. Until you do that, old packages will"
-		ewarn "work if you edit /etc/ld.so.conf and change 'compiler70'"
-		ewarn "to 'compiler60' and run 'ldconfig.' Note that this edit"
-		ewarn "won't persist and will require you to re-edit after each"
-		ewarn "package you re-install."
-		ewarn "BEFORE COMPILING IMPORTANT APPLICATIONS THAT YOUR"
-		ewarn "SYSTEM DEPENDS ON, READ THE WARNING ABOVE."
-		ewarn "THIS COULD RENDER YOUR SYSTEM UNUSABLE."
-		ewarn "THIS IS A PROBLEM WITH INTEL'S SOFTWARE, _NOT_"
-		ewarn "WITH GENTOO."
-	ewarn "If 'icc' breaks, use 'iccbin' instead and report a bug."
-	ewarn "Please use 'source /etc/profile' prior to merging any icc-enabled"
-	ewarn "ebuilds."
-}
diff --git a/dev-lang/icc/icc-7.0.065.ebuild b/dev-lang/icc/icc-7.0.065.ebuild
deleted file mode 100644
index 78cd805593c9..000000000000
--- a/dev-lang/icc/icc-7.0.065.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/icc-7.0.065.ebuild,v 1.8 2004/06/24 22:50:29 agriffis Exp $
-
-S=${WORKDIR}
-
-DESCRIPTION="Intel C++ Compiler - The Pentium optimized compiler for Linux"
-
-SRC_URI1="ftp://download.intel.com/software/products/compilers/downloads/l_cc_p_7.0.065.tar"
-SRC_URI2="ftp://download.intel.co.jp/software/products/compilers/downloads/l_cc_p_7.0.065.tar"
-SRC_URI="${SRC_URI1} ${SRC_URI2}"
-
-HOMEPAGE="http://www.intel.com/software/products/compilers/clin/"
-
-LICENSE="icc-7.0"
-
-DEPEND="virtual/linux-sources
-		>=sys-libs/glibc-2.2.4
-		app-arch/cpio
-		app-arch/rpm"
-
-RDEPEND="virtual/linux-sources
-		>=sys-libs/glibc-2.2.4"
-
-SLOT="7"
-KEYWORDS="-* x86"
-IUSE=""
-
-src_compile() {
-	# Keep disk space to a minimum
-	rm -f intel-*.ia64.rpm
-
-	mkdir opt
-
-	for x in intel-*.i386.rpm
-	do
-		einfo "Extracting: ${x}"
-		rpm2cpio ${x} | cpio --extract --make-directories --unconditional
-	done
-
-	# From UNTAG_CFG_FILES in 'install'
-	SD=${S}/opt/intel # Build DESTINATION
-	RD=/opt/intel # Real DESTINATION
-	for FILE in $(find $SD/compiler*/ia??/bin/ -regex '.*[ei][cf]p?c$\|.*cfg$\|.*pcl$\|.*vars[^/]*.c?sh$' 2>/dev/null)
-	do
-		sed s@\<INSTALLDIR\>@$RD@g ${FILE} > ${FILE}.abs
-		mv -f ${FILE}.abs ${FILE}
-		chmod 755 ${FILE}
-	done
-
-	# From UNTAG_SUPPORT in 'install'
-	eval `grep "^[ ]*COMBOPACKAGEID=" install`
-
-	for SUPPORTFILE in ${SD}/compiler*/docs/*support
-	do
-		einfo "Untagging: ${SUPPORTFILE}"
-		sed s@\<INSTALLTIMECOMBOPACKAGEID\>@$COMBOPACKAGEID@g $SUPPORTFILE > $SUPPORTFILE.abs
-		mv $SUPPORTFILE.abs $SUPPORTFILE
-		chmod 644 $SUPPORTFILE
-	done
-}
-
-src_install () {
-	dodoc lgpltext
-	dodoc clicense
-	cp -a opt ${D}
-
-	# icc enviroment
-	insinto /etc/env.d
-	doins ${FILESDIR}/${PVR}/05icc-ifc
-	# fix the issue with the primary icc executable
-	exeinto /opt/intel/compiler70/ia32/bin
-	doexe ${FILESDIR}/${PVR}/icc
-}
-
-pkg_postinst () {
-	einfo
-	einfo "http://www.intel.com/software/products/compilers/clin/noncom.htm"
-	einfo "From the above url you can get a free, non-commercial"
-	einfo "license to use the Intel C++ Compiler emailed to you."
-	einfo "You cannot run icc without this license file."
-	einfo "Read the website for more information on this license."
-	einfo
-	einfo "Documentation can be found in /opt/intel/compiler70/docs/"
-	einfo
-	einfo "You will need to place your license in /opt/intel/licenses/"
-	einfo
-	if [ -d /opt/intel/compiler?0 ]
-	then
-		ewarn
-		ewarn "Packages compiled with older versions of icc will need"
-		ewarn "to be recompiled. Until you do that, old packages will"
-		ewarn "work if you edit /etc/ld.so.conf and change 'compiler70'"
-		ewarn "to 'compiler60' and run 'ldconfig.' Note that this edit"
-		ewarn "won't persist and will require you to re-edit after each"
-		ewarn "package you re-install."
-	fi
-	ewarn "If 'icc' breaks, use 'iccbin' instead and report a bug."
-	ewarn "NOTE: Before compiling important applications that your system"
-	ewarn "depends on, read the warning above. This could potentially"
-	ewarn "render your system unusable. This is a problem with Intel's"
-	ewarn "software, _not_ with Gentoo."
-}
diff --git a/dev-lang/icc/icc-7.1.006.ebuild b/dev-lang/icc/icc-7.1.006.ebuild
deleted file mode 100644
index ccbd9c773be0..000000000000
--- a/dev-lang/icc/icc-7.1.006.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/icc-7.1.006.ebuild,v 1.9 2004/06/24 22:50:29 agriffis Exp $
-
-inherit rpm
-
-S=${WORKDIR}
-
-DESCRIPTION="Intel C++ Compiler - Intel's Pentium optimized compiler for Linux"
-
-SRC_URI1="ftp://download.intel.com/software/products/compilers/downloads/l_cc_p_7.1.006.tar"
-SRC_URI2="ftp://download.intel.co.jp/software/products/compilers/downloads/l_cc_p_7.1.006.tar"
-SRC_URI="${SRC_URI1} ${SRC_URI2}"
-
-HOMEPAGE="http://www.intel.com/software/products/compilers/clin/"
-
-LICENSE="icc-7.0"
-
-DEPEND=">=sys-libs/glibc-2.2.5 \
-	x86? ( sys-libs/lib-compat )"
-
-SLOT="7"
-KEYWORDS="-* ia64 x86"
-IUSE=""
-
-RESTRICT="nostrip"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# Keep disk space to a minimum
-	if [ "$ARCH" = "x86" ]
-	then
-		rm -f intel-*.ia64.rpm
-	else
-		rm -f intel-*.i386.rpm
-	fi
-
-	for x in *.rpm
-	do
-		rpm_unpack $x
-	done
-}
-src_compile() {
-
-	# From UNTAG_CFG_FILES in 'install'
-	SD=${S}/opt/intel # Build DESTINATION
-	RD=/opt/intel # Real DESTINATION
-	for FILE in $(find $SD/compiler*/ia??/bin/ -regex '.*[ei][cf]p?c$\|.*cfg$\|.*pcl$\|.*vars[^/]*.c?sh$' 2>/dev/null)
-	do
-		sed s@\<INSTALLDIR\>@$RD@g ${FILE} > ${FILE}.abs
-		mv -f ${FILE}.abs ${FILE}
-		chmod 755 ${FILE}
-	done
-
-	# From UNTAG_SUPPORT in 'install'
-	eval `grep "^[ ]*COMBOPACKAGEID=" install`
-
-	for SUPPORTFILE in ${SD}/compiler*/docs/*support
-	do
-		einfo "Untagging: ${SUPPORTFILE}"
-		sed s@\<INSTALLTIMECOMBOPACKAGEID\>@$COMBOPACKAGEID@g $SUPPORTFILE > $SUPPORTFILE.abs
-		mv $SUPPORTFILE.abs $SUPPORTFILE
-		chmod 644 $SUPPORTFILE
-	done
-
-	# these should not be executable
-	find "${SD}/compiler70/"{docs,man,training,ia32/include} -type f -exec chmod -x "{}" ";"
-	find "${SD}/compiler70/ia32/lib" -name \*.a -exec chmod -x "{}" ";"
-
-}
-
-src_install () {
-	dodoc lgpltext
-	dodoc clicense
-	cp -a opt ${D}
-
-	insinto /etc/env.d
-	if [ "$ARCH" = "x86" ]
-	then
-		newins ${FILESDIR}/${PVR}/05icc-ifc-ia32 05icc-ifc || die
-		# fix the processor name issue with the primary icc executable
-		exeinto /opt/intel/compiler70/ia32/bin
-		newexe ${FILESDIR}/${PVR}/icc-ia32 icc
-		newexe ${FILESDIR}/${PVR}/icpc-ia32 icc
-	else
-		newins ${FILESDIR}/${PVR}/05icc-ifc-ia64 05icc-ifc || die
-		dodir /usr/bin
-		dosym ../../opt/intel/compiler70/ia64/bin/eccbin /usr/bin/ecc
-		dosym ../../opt/intel/compiler70/ia64/bin/ecpcbin /usr/bin/ecpc
-	fi
-
-
-}
-
-pkg_postinst () {
-	einfo "The ICC compiler for Itanium systems is called \"ecc\"."
-	einfo "http://www.intel.com/software/products/compilers/clin/noncom.htm"
-	einfo "From the above url you can get a free, non-commercial"
-	einfo "license to use the Intel C++ Compiler emailed to you."
-	einfo "You cannot run icc without this license file."
-	einfo "Read the website for more information on this license."
-	einfo
-	einfo "Documentation can be found in /opt/intel/compiler70/docs/"
-	einfo
-	einfo "You will need to place your license in /opt/intel/licenses/"
-	einfo
-
-	ewarn
-	ewarn "Packages compiled with versions of icc older than 7.0 will need"
-	ewarn "to be recompiled. Until you do that, old packages will"
-	ewarn "work if you edit /etc/ld.so.conf and change 'compiler70'"
-	ewarn "to 'compiler60' and run 'ldconfig.' Note that this edit"
-	ewarn "won't persist and will require you to re-edit after each"
-	ewarn "package you re-install."
-	ewarn "BEFORE COMPILING IMPORTANT APPLICATIONS THAT YOUR"
-	ewarn "SYSTEM DEPENDS ON, READ THE WARNING ABOVE."
-	ewarn "THIS COULD RENDER YOUR SYSTEM UNUSABLE."
-	ewarn "THIS IS A PROBLEM WITH INTEL'S SOFTWARE, _NOT_"
-	ewarn "WITH GENTOO."
-
-	ewarn "If 'icc' breaks, use 'iccbin' instead and report a bug."
-	ewarn "Please use 'source /etc/profile' prior to merging any icc-enabled"
-	ewarn "ebuilds."
-}
diff --git a/dev-lang/icc/icc-7.1.029.ebuild b/dev-lang/icc/icc-7.1.029.ebuild
deleted file mode 100644
index d62aa00a7b52..000000000000
--- a/dev-lang/icc/icc-7.1.029.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/icc-7.1.029.ebuild,v 1.6 2004/06/24 22:50:29 agriffis Exp $
-
-inherit rpm
-
-S=${WORKDIR}
-
-DESCRIPTION="Intel C++ Compiler - Intel's Pentium optimized compiler for Linux"
-
-SRC_URI1="ftp://download.intel.com/software/products/compilers/downloads/l_cc_pc_${PV}.tar"
-SRC_URI2="ftp://download.intel.co.jp/software/products/compilers/downloads/l_cc_pc_${PV}.tar"
-SRC_URI="${SRC_URI1} ${SRC_URI2}"
-
-HOMEPAGE="http://www.intel.com/software/products/compilers/clin/"
-
-LICENSE="icc-7.0"
-
-DEPEND="virtual/linux-sources
-		>=sys-libs/glibc-2.2.5
-		x86? ( sys-libs/lib-compat )"
-
-RDEPEND="virtual/linux-sources
-		>=sys-libs/glibc-2.2.5"
-
-SLOT="7"
-KEYWORDS="-* ~ia64 ~x86"
-IUSE=""
-
-RESTRICT="nostrip"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# Keep disk space to a minimum
-	if [ "$ARCH" = "x86" ]
-	then
-		rm -f intel-*.ia64.rpm
-	else
-		rm -f intel-*.i386.rpm
-	fi
-
-	rpm_unpack *.rpm
-
-}
-src_compile() {
-
-	# From UNTAG_CFG_FILES in 'install'
-	SD=${S}/opt/intel # Build DESTINATION
-	RD=/opt/intel # Real DESTINATION
-	for FILE in $(find $SD/compiler*/ia??/bin/ -regex '.*[ei][cf]p?c$\|.*cfg$\|.*pcl$\|.*vars[^/]*.c?sh$' 2>/dev/null)
-	do
-		sed s@\<INSTALLDIR\>@$RD@g ${FILE} > ${FILE}.abs
-		mv -f ${FILE}.abs ${FILE}
-		chmod 755 ${FILE}
-	done
-
-	# From UNTAG_SUPPORT in 'install'
-	eval `grep "^[ ]*COMBOPACKAGEID=" install`
-
-	for SUPPORTFILE in ${SD}/compiler*/docs/*support
-	do
-		einfo "Untagging: ${SUPPORTFILE}"
-		sed s@\<INSTALLTIMECOMBOPACKAGEID\>@$COMBOPACKAGEID@g $SUPPORTFILE > $SUPPORTFILE.abs
-		mv $SUPPORTFILE.abs $SUPPORTFILE
-		chmod 644 $SUPPORTFILE
-	done
-
-	# these should not be executable
-	find "${SD}/compiler70/"{docs,man,training,ia32/include} -type f -exec chmod -x "{}" ";"
-	find "${SD}/compiler70/ia32/lib" -name \*.a -exec chmod -x "{}" ";"
-
-}
-
-src_install () {
-	dodoc lgpltext
-	dodoc clicense
-	cp -a opt ${D}
-
-	insinto /etc/env.d
-	if [ "$ARCH" = "x86" ]
-	then
-		newins ${FILESDIR}/${PVR}/05icc-ifc-ia32 05icc-ifc || die
-		# fix the processor name issue with the primary icc executable
-		exeinto /opt/intel/compiler70/ia32/bin
-		newexe ${FILESDIR}/${PVR}/icc-ia32 icc
-		newexe ${FILESDIR}/${PVR}/icpc-ia32 icc
-	else
-		newins ${FILESDIR}/${PVR}/05icc-ifc-ia64 05icc-ifc || die
-		dodir /usr/bin
-		dosym ../../opt/intel/compiler70/ia64/bin/eccbin /usr/bin/ecc
-		dosym ../../opt/intel/compiler70/ia64/bin/ecpcbin /usr/bin/ecpc
-	fi
-
-
-}
-
-pkg_postinst () {
-	einfo "The ICC compiler for Itanium systems is called \"ecc\"."
-	einfo "http://www.intel.com/software/products/compilers/clin/noncom.htm"
-	einfo "From the above url you can get a free, non-commercial"
-	einfo "license to use the Intel C++ Compiler emailed to you."
-	einfo "You cannot run icc without this license file."
-	einfo "Read the website for more information on this license."
-	einfo
-	einfo "Documentation can be found in /opt/intel/compiler70/docs/"
-	einfo
-	einfo "You will need to place your license in /opt/intel/licenses/"
-	einfo
-
-	ewarn
-	ewarn "Packages compiled with versions of icc older than 7.0 will need"
-	ewarn "to be recompiled. Until you do that, old packages will"
-	ewarn "work if you edit /etc/ld.so.conf and change 'compiler70'"
-	ewarn "to 'compiler60' and run 'ldconfig.' Note that this edit"
-	ewarn "won't persist and will require you to re-edit after each"
-	ewarn "package you re-install."
-	ewarn "BEFORE COMPILING IMPORTANT APPLICATIONS THAT YOUR"
-	ewarn "SYSTEM DEPENDS ON, READ THE WARNING ABOVE."
-	ewarn "THIS COULD RENDER YOUR SYSTEM UNUSABLE."
-	ewarn "THIS IS A PROBLEM WITH INTEL'S SOFTWARE, _NOT_"
-	ewarn "WITH GENTOO."
-
-	ewarn "If 'icc' breaks, use 'iccbin' instead and report a bug."
-	ewarn "Please use 'source /etc/profile' prior to merging any icc-enabled"
-	ewarn "ebuilds."
-}
diff --git a/dev-lang/icc/icc-7.1.030.ebuild b/dev-lang/icc/icc-7.1.030.ebuild
deleted file mode 100644
index 6acf86383b65..000000000000
--- a/dev-lang/icc/icc-7.1.030.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/icc-7.1.030.ebuild,v 1.6 2004/06/24 22:50:29 agriffis Exp $
-
-inherit rpm
-
-S=${WORKDIR}
-#what dir to use in FILESDIR
-FILESV=7.1.029
-DESCRIPTION="Intel C++ Compiler - Intel's Pentium optimized compiler for Linux"
-
-#currently must be downloaded from premier.intel.com
-#SRC_URI1="ftp://download.intel.com/software/products/compilers/downloads/l_cc_pc_${PV}.tar"
-#SRC_URI2="ftp://download.intel.co.jp/software/products/compilers/downloads/l_cc_pc_${PV}.tar"
-SRC_URI="l_cc_pc_${PV}.tar"
-
-HOMEPAGE="http://www.intel.com/software/products/compilers/clin/"
-
-LICENSE="icc-7.0"
-
-DEPEND="virtual/linux-sources
-		>=sys-libs/glibc-2.2.5
-		x86? ( sys-libs/lib-compat )"
-
-RDEPEND="virtual/linux-sources
-		>=sys-libs/glibc-2.2.5"
-
-SLOT="7"
-KEYWORDS="-* ~ia64 ~x86"
-IUSE=""
-
-RESTRICT="nostrip fetch"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# Keep disk space to a minimum
-	if [ "$ARCH" = "x86" ]
-	then
-		rm -f intel-*.ia64.rpm
-	else
-		rm -f intel-*.i386.rpm
-	fi
-
-	for x in *.rpm
-	do
-		rpm_unpack *.rpm
-	done
-}
-src_compile() {
-
-	# From UNTAG_CFG_FILES in 'install'
-	SD=${S}/opt/intel # Build DESTINATION
-	RD=/opt/intel # Real DESTINATION
-	for FILE in $(find $SD/compiler*/ia??/bin/ -regex '.*[ei][cf]p?c$\|.*cfg$\|.*pcl$\|.*vars[^/]*.c?sh$' 2>/dev/null)
-	do
-		sed s@\<INSTALLDIR\>@$RD@g ${FILE} > ${FILE}.abs
-		mv -f ${FILE}.abs ${FILE}
-		chmod 755 ${FILE}
-	done
-
-	# From UNTAG_SUPPORT in 'install'
-	eval `grep "^[ ]*COMBOPACKAGEID=" install`
-
-	for SUPPORTFILE in ${SD}/compiler*/docs/*support
-	do
-		einfo "Untagging: ${SUPPORTFILE}"
-		sed s@\<INSTALLTIMECOMBOPACKAGEID\>@$COMBOPACKAGEID@g $SUPPORTFILE > $SUPPORTFILE.abs
-		mv $SUPPORTFILE.abs $SUPPORTFILE
-		chmod 644 $SUPPORTFILE
-	done
-
-	# these should not be executable
-	find "${SD}/compiler70/"{docs,man,training,ia32/include} -type f -exec chmod -x "{}" ";"
-	find "${SD}/compiler70/ia32/lib" -name \*.a -exec chmod -x "{}" ";"
-
-}
-
-src_install () {
-	dodoc lgpltext
-	dodoc clicense
-	cp -a opt ${D}
-
-	insinto /etc/env.d
-	if [ "$ARCH" = "x86" ]
-	then
-		newins ${FILESDIR}/${FILESV}/05icc-ifc-ia32 05icc-ifc || die
-		# fix the processor name issue with the primary icc executable
-		exeinto /opt/intel/compiler70/ia32/bin
-		newexe ${FILESDIR}/${FILESV}/icc-ia32 icc
-		newexe ${FILESDIR}/${FILESV}/icpc-ia32 icc
-	else
-		newins ${FILESDIR}/${FILESV}/05icc-ifc-ia64 05icc-ifc || die
-		dodir /usr/bin
-		dosym ../../opt/intel/compiler70/ia64/bin/eccbin /usr/bin/ecc
-		dosym ../../opt/intel/compiler70/ia64/bin/ecpcbin /usr/bin/ecpc
-	fi
-
-
-}
-
-pkg_postinst () {
-	einfo "The ICC compiler for Itanium systems is called \"ecc\"."
-	einfo "http://www.intel.com/software/products/compilers/clin/noncom.htm"
-	einfo "From the above url you can get a free, non-commercial"
-	einfo "license to use the Intel C++ Compiler emailed to you."
-	einfo "You cannot run icc without this license file."
-	einfo "Read the website for more information on this license."
-	einfo
-	einfo "Documentation can be found in /opt/intel/compiler70/docs/"
-	einfo
-	einfo "You will need to place your license in /opt/intel/licenses/"
-	einfo
-
-	ewarn
-	ewarn "Packages compiled with versions of icc older than 7.0 will need"
-	ewarn "to be recompiled. Until you do that, old packages will"
-	ewarn "work if you edit /etc/ld.so.conf and change 'compiler70'"
-	ewarn "to 'compiler60' and run 'ldconfig.' Note that this edit"
-	ewarn "won't persist and will require you to re-edit after each"
-	ewarn "package you re-install."
-	ewarn "BEFORE COMPILING IMPORTANT APPLICATIONS THAT YOUR"
-	ewarn "SYSTEM DEPENDS ON, READ THE WARNING ABOVE."
-	ewarn "THIS COULD RENDER YOUR SYSTEM UNUSABLE."
-	ewarn "THIS IS A PROBLEM WITH INTEL'S SOFTWARE, _NOT_"
-	ewarn "WITH GENTOO."
-
-	ewarn "If 'icc' breaks, use 'iccbin' instead and report a bug."
-	ewarn "Please use 'source /etc/profile' prior to merging any icc-enabled"
-	ewarn "ebuilds."
-}
diff --git a/dev-lang/icc/icc-8.0.055.ebuild b/dev-lang/icc/icc-8.0.055.ebuild
deleted file mode 100644
index 4329a0218ec3..000000000000
--- a/dev-lang/icc/icc-8.0.055.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/icc-8.0.055.ebuild,v 1.3 2004/06/24 22:50:29 agriffis Exp $
-
-inherit rpm
-
-S=${WORKDIR}
-
-DESCRIPTION="Intel C++ Compiler - Intel's Pentium optimized compiler for Linux"
-
-SRC_BASE="l_cc_p_8.0.055"
-SRC_PACK="${SRC_BASE}.tar.gz"
-SRC_URI1="ftp://download.intel.com/software/products/compilers/downloads/${SRC_PACK}"
-SRC_URI2="ftp://download.intel.co.jp/software/products/compilers/downloads/${SRC_PACK}"
-SRC_URI="${SRC_URI1} ${SRC_URI2}"
-# Both IA32 and IA64 can be installed here since all files have a distinct name.
-INSTALL_DIR="/opt/intel/compiler80"
-
-HOMEPAGE="http://www.intel.com/software/products/compilers/clin/"
-
-LICENSE="icc-7.0"
-
-DEPEND=">=sys-libs/glibc-2.2.5
-		x86? ( sys-libs/lib-compat )"
-
-SLOT="8"
-KEYWORDS="~ia64 ~x86"
-IUSE=""
-
-RESTRICT="nostrip"
-
-src_unpack() {
-	unpack ${SRC_PACK}
-	cd ${WORKDIR}/${SRC_BASE}
-
-	# Only use our architecture
-	if [ "$ARCH" = "x86" ]
-	then
-		rm -f intel-*.ia64.rpm
-	else
-		rm -f intel-*.i386.rpm
-	fi
-
-	for x in *.rpm
-	do
-		# WORKDIR must be set properly for rpm_unpack()
-		rpm_unpack ${WORKDIR}/${SRC_BASE}/${x}
-	done
-}
-
-src_compile() {
-	# From UNTAG_CFG_FILES() in 'install.sh'
-	# Keep the Fortran bits(...)
-	for FILE in $(find ${S}/opt/intel_*/bin/ -regex '.*[ei](cc|fort|fc|cpc)$\|.*cfg$\|.*pcl$\|.*vars[^/]*.c?sh$' 2>/dev/null)
-	do
-		sed s@\<INSTALLDIR\>@${INSTALL_DIR}@g ${FILE} > ${FILE}.abs
-		mv -f ${FILE}.abs ${FILE}
-		chmod 755 ${FILE}
-	done
-
-	# == SRC_BASE
-	eval `grep "^[ ]*PACKAGEID=" ${SRC_BASE}/install.sh`
-
-	# From UNTAG_SUPPORT() in 'install.sh'
-	SUPPORTFILE=${S}/opt/intel_cc_80/doc/csupport
-	if [ -f ${SUPPORTFILE} ]
-	then
-		einfo "Untagging: ${SUPPORTFILE}"
-		sed s@\<installpackageid\>@${PACKAGEID}@g ${SUPPORTFILE} > ${SUPPORTFILE}.abs
-		mv ${SUPPORTFILE}.abs ${SUPPORTFILE}
-		chmod 644 ${SUPPORTFILE}
-	fi
-
-	# From UNTAG_SUPPORT_IDB() in 'install.sh'
-	SUPPORTFILE=${S}/opt/intel_idb_73/doc/idbsupport
-	if [ -f ${SUPPORTFILE} ]
-	then
-		einfo "Untagging: ${SUPPORTFILE}"
-		sed s@\<INSTALLTIMECOMBOPACKAGEID\>@${PACKAGEID}@g ${SUPPORTFILE} > ${SUPPORTFILE}.abs
-		mv ${SUPPORTFILE}.abs ${SUPPORTFILE}
-		chmod 644 ${SUPPORTFILE}
-	fi
-
-	# These should not be executable
-	find "${S}/opt/intel_cc_80/"{doc,man,include} -type f -exec chmod -x "{}" ";"
-	find "${S}/opt/intel_cc_80/lib" -name \*.a -exec chmod -x "{}" ";"
-	find "${S}/opt/intel_idb_73/"{doc,man} -type f -exec chmod -x "{}" ";"
-}
-
-src_install () {
-	dodoc ${SRC_BASE}/lgpltext
-	dodoc ${SRC_BASE}/clicense
-	install -d ${D}/${INSTALL_DIR}
-	cp -a opt/intel_cc_80/* ${D}/${INSTALL_DIR}
-	cp -a opt/intel_idb_73/* ${D}/${INSTALL_DIR}
-	insinto /etc/env.d
-	doins ${FILESDIR}/${PVR}/05icc-ifc || die
-	exeinto /opt/intel/compiler80/bin
-	doexe ${FILESDIR}/${PVR}/icc
-	doexe ${FILESDIR}/${PVR}/icpc
-}
-
-pkg_postinst () {
-	einfo "http://www.intel.com/software/products/compilers/clin/noncom.htm"
-	einfo "From the above url you can get a free, non-commercial"
-	einfo "license to use the Intel C++ Compiler emailed to you."
-	einfo "You cannot run icc without this license file."
-	einfo "Read the website for more information on this license."
-	einfo
-	einfo "Documentation can be found in ${INSTALL_DIR}/doc/"
-	einfo
-	einfo "You will need to place your license in ${INSTALL_DIR}/licenses/"
-	einfo
-
-	ewarn
-	ewarn "Packages compiled with versions of icc older than 8.0 will need"
-	ewarn "to be recompiled. Until you do that, old packages will"
-	ewarn "work if you edit /etc/ld.so.conf and change '${INSTALL_DIR}'"
-	ewarn "to '/opt/intel/compiler70' and run 'ldconfig.' Note that this edit"
-	ewarn "won't persist and will require you to re-edit after each"
-	ewarn "package you re-install."
-	ewarn "BEFORE COMPILING IMPORTANT APPLICATIONS THAT YOUR"
-	ewarn "SYSTEM DEPENDS ON, READ THE WARNING ABOVE."
-	ewarn "THIS COULD RENDER YOUR SYSTEM UNUSABLE."
-	ewarn "THIS IS A PROBLEM WITH INTEL'S SOFTWARE, _NOT_"
-	ewarn "WITH GENTOO."
-
-	ewarn "If 'icc' breaks, use 'iccbin' instead and report a bug."
-	ewarn "Please use 'source /etc/profile' prior to merging any icc-enabled"
-	ewarn "ebuilds."
-}
diff --git a/dev-lang/icc/icc-8.1.028.ebuild b/dev-lang/icc/icc-8.1.028.ebuild
deleted file mode 100644
index da5427f3baa1..000000000000
--- a/dev-lang/icc/icc-8.1.028.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/icc-8.1.028.ebuild,v 1.1 2005/07/24 02:35:16 karltk Exp $
-
-inherit rpm
-
-DESCRIPTION="Intel C++ Compiler - Intel's Pentium optimized compiler for Linux"
-SRC_URI="ftp://download.intel.com/software/products/compilers/downloads/l_cc_pc_${PV}.tar.gz"
-HOMEPAGE="http://www.intel.com/software/products/compilers/clin/"
-LICENSE="icc-8.1"
-RDEPEND=">=sys-libs/glibc-2.2.5
-	x86? ( sys-libs/lib-compat )"
-SLOT="8.1"
-KEYWORDS="~x86"
-IUSE=""
-RESTRICT="nostrip fetch"
-S="${WORKDIR}/l_cc_pc_${PV}"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S} || die
-
-	# The tarball contains rpms for multiple arches, and a lot of
-	# auxiliary rpms common across arches. We must throw away 
-	# the arch we're not.
-	if [ "$ARCH" = "x86" ]
-	then
-		rm -f intel-*.ia64.rpm
-	else
-		rm -f intel-*.i386.rpm
-	fi
-
-	for x in *.rpm
-	do
-		# WORKDIR must be set properly for rpm_unpack()
-		rpm_unpack ${S}/${x}
-	done
-
-}
-
-src_compile() {
-	instdir=/opt/intel/compiler81
-
-	for x in opt/intel_cc_80/bin/{iccvars.csh,iccvars.sh} opt/intel_idb_80/bin/idbvars.{csh,sh} ; do
-		sed "s|<INSTALLDIR>|${instdir}|g" -i $x
-	done
-
-	# == SRC_BASE
-	eval `grep "^[ ]*PACKAGEID=" ${S}/install.sh`
-
-	# From UNTAG_SUPPORT() in 'install.sh'
-	SUPPORTFILE=${S}/opt/intel_cc_80/doc/csupport
-	if [ -f ${SUPPORTFILE} ]
-	then
-		einfo "Untagging: ${SUPPORTFILE}"
-		sed s@\<installpackageid\>@${PACKAGEID}@g ${SUPPORTFILE} > ${SUPPORTFILE}.abs
-		mv ${SUPPORTFILE}.abs ${SUPPORTFILE}
-		chmod 644 ${SUPPORTFILE}
-	fi
-
-	# From UNTAG_SUPPORT_IDB() in 'install.sh'
-	SUPPORTFILE=${S}/opt/intel_idb_80/doc/idbsupport
-	if [ -f ${SUPPORTFILE} ]
-	then
-		einfo "Untagging: ${SUPPORTFILE}"
-		sed s@\<INSTALLTIMECOMBOPACKAGEID\>@${PACKAGEID}@g ${SUPPORTFILE} > ${SUPPORTFILE}.abs
-		mv ${SUPPORTFILE}.abs ${SUPPORTFILE}
-		chmod 644 ${SUPPORTFILE}
-	fi
-
-	# These should not be executable
-	find "${S}/opt/intel_cc_80/"{doc,man,include} -type f -exec chmod -x "{}" ";"
-	find "${S}/opt/intel_cc_80/lib" -name \*.a -exec chmod -x "{}" ";"
-	find "${S}/opt/intel_idb_80/"{doc,man} -type f -exec chmod -x "{}" ";"
-}
-
-src_install () {
-	instdir=/opt/intel/compiler81
-	dodoc ${S}/lgpltext
-	dodoc ${S}/clicense
-	dodir ${instdir}
-	cp -a opt/intel_cc_80/* ${D}/${instdir}
-	cp -a opt/intel_idb_80/* ${D}/${instdir}
-	insinto /etc/env.d
-	doins ${FILESDIR}/${PVR}/05icc-ifc || die
-	exeinto ${instdir}/bin
-	doexe ${FILESDIR}/${PVR}/icc || die
-	doexe ${FILESDIR}/${PVR}/icpc || die
-}
-
-pkg_postinst () {
-	instdir=/opt/intel/compiler81
-
-	einfo "http://www.intel.com/software/products/compilers/clin/noncom.htm"
-	einfo "From the above url you can get a free, non-commercial"
-	einfo "license to use the Intel C++ Compiler emailed to you."
-	einfo "You cannot run icc without this license file."
-	einfo "Read the website for more information on this license."
-	einfo
-	einfo "Documentation can be found in ${instdir}/doc/"
-	einfo
-	einfo "You will need to place your license in ${instdir}/licenses/"
-	einfo
-
-	ewarn
-	ewarn "Packages compiled with versions of icc older than 8.0 will need"
-	ewarn "to be recompiled. Until you do that, old packages will"
-	ewarn "work if you edit /etc/ld.so.conf and change '${instdir}'"
-	ewarn "to '/opt/intel/compiler70' and run 'ldconfig.' Note that this edit"
-	ewarn "won't persist and will require you to re-edit after each"
-	ewarn "package you re-install."
-	ewarn "BEFORE COMPILING IMPORTANT APPLICATIONS THAT YOUR"
-	ewarn "SYSTEM DEPENDS ON, READ THE WARNING ABOVE."
-	ewarn "THIS COULD RENDER YOUR SYSTEM UNUSABLE."
-	ewarn "THIS IS A PROBLEM WITH INTEL'S SOFTWARE, _NOT_"
-	ewarn "WITH GENTOO."
-
-	ewarn "If 'icc' breaks, use 'iccbin' instead and report a bug."
-	ewarn "Please use 'source /etc/profile' prior to merging any icc-enabled"
-	ewarn "ebuilds."
-}
diff --git a/dev-lang/icc/icc-9.0.021.ebuild b/dev-lang/icc/icc-9.0.021.ebuild
deleted file mode 100644
index 8c51d17eeb5a..000000000000
--- a/dev-lang/icc/icc-9.0.021.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/icc-9.0.021.ebuild,v 1.2 2005/07/30 18:56:36 karltk Exp $
-
-inherit rpm
-
-DESCRIPTION="Intel C++ Compiler - Intel's Pentium optimized compiler for Linux"
-SRC_URI="l_cc_p_${PV}.tar.gz"
-HOMEPAGE="http://www.intel.com/software/products/compilers/clin/"
-LICENSE="icc-9.0"
-RDEPEND=">=sys-libs/glibc-2.2.5"
-SLOT="9.0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="nostrip fetch"
-S="${WORKDIR}/l_cc_p_${PV}"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S} || die
-
-	# The tarball contains rpms for multiple arches, and a lot of
-	# auxiliary rpms common across arches. We must throw away 
-	# the arch we're not.
-	case ${ARCH} in
-		amd64)
-			rm -f intel-*.{i386,ia64}.rpm
-			;;
-		ia64)
-			rm -f intel-*.{em64t,i386}.rpm
-			;;
-		x86)
-			rm -f intel-*.{em64t,ia64}.rpm
-			;;
-	esac
-
-	for x in *.rpm
-	do
-		# WORKDIR must be set properly for rpm_unpack()
-		rpm_unpack ${S}/${x}
-	done
-
-}
-
-src_compile() {
-	instdir=/opt/intel/compiler90
-
-	for x in opt/intel/*/*/bin/* ; do
-		sed "s|<INSTALLDIR>|${instdir}|g" -i $x
-	done
-
-	# == SRC_BASE
-	eval `grep "^[ ]*PACKAGEID=" ${S}/install.sh`
-
-	# From UNTAG_SUPPORT() in 'install.sh'
-	SUPPORTFILE=${S}/opt/intel/cc*/9.0/doc/csupport
-	if [ -f ${SUPPORTFILE} ]
-	then
-		einfo "Untagging: ${SUPPORTFILE}"
-		sed "s|<installpackageid>|${PACKAGEID}|g" \
-			-i ${SUPPORTFILE}
-		chmod 644 ${SUPPORTFILE}
-	fi
-
-	# From UNTAG_SUPPORT_IDB() in 'install.sh'
-	SUPPORTFILE=${S}/opt/intel/idb*/9.0/doc/idbsupport
-	if [ -f ${SUPPORTFILE} ]
-	then
-		einfo "Untagging: ${SUPPORTFILE}"
-		sed -e "s|<INSTALLTIMECOMBOPACKAGEID>|${PACKAGEID}|g" \
-			-i ${SUPPORTFILE}
-		chmod 644 ${SUPPORTFILE}
-	fi
-
-	# These should not be executable
-	find "${S}/opt/intel/cc/9.0/"{doc,man,include} -type f -exec chmod -x "{}" ";"
-	find "${S}/opt/intel/cc/9.0/lib" -name \*.a -exec chmod -x "{}" ";"
-	find "${S}/opt/intel/idb/9.0/"{doc,man} -type f -exec chmod -x "{}" ";"
-}
-
-src_install () {
-	instdir=/opt/intel/compiler90
-	dodoc ${S}/lgpltext
-	dodoc ${S}/clicense
-	dodir ${instdir}
-	cp -a opt/intel/cc*/9.0/* ${D}/${instdir}
-	cp -a opt/intel/idb*/9.0/* ${D}/${instdir}
-	insinto /etc/env.d
-	doins ${FILESDIR}/${PVR}/05icc-ifc || die
-	exeinto ${instdir}/bin
-	doexe ${FILESDIR}/${PVR}/icc || die
-	doexe ${FILESDIR}/${PVR}/icpc || die
-}
-
-pkg_postinst () {
-	instdir=/opt/intel/compiler90
-
-	einfo "http://www.intel.com/software/products/compilers/clin/noncom.htm"
-	einfo "From the above url you can get a free, non-commercial"
-	einfo "license to use the Intel C++ Compiler emailed to you."
-	einfo "You cannot run icc without this license file."
-	einfo "Read the website for more information on this license."
-	einfo
-	einfo "Documentation can be found in ${instdir}/doc/"
-	einfo
-	einfo "You will need to place your license in ${instdir}/licenses/"
-	einfo
-
-	ewarn
-	ewarn "Packages compiled with versions of icc older than 8.0 will need"
-	ewarn "to be recompiled. Until you do that, old packages will"
-	ewarn "work if you edit /etc/ld.so.conf and change '${instdir}'"
-	ewarn "to '/opt/intel/compiler70' and run 'ldconfig.' Note that this edit"
-	ewarn "won't persist and will require you to re-edit after each"
-	ewarn "package you re-install."
-	ewarn "BEFORE COMPILING IMPORTANT APPLICATIONS THAT YOUR"
-	ewarn "SYSTEM DEPENDS ON, READ THE WARNING ABOVE."
-	ewarn "THIS COULD RENDER YOUR SYSTEM UNUSABLE."
-	ewarn "THIS IS A PROBLEM WITH INTEL'S SOFTWARE, _NOT_"
-	ewarn "WITH GENTOO."
-
-	ewarn "If 'icc' breaks, use 'iccbin' instead and report a bug."
-	ewarn "Please use 'source /etc/profile' prior to merging any icc-enabled"
-	ewarn "ebuilds."
-}
diff --git a/dev-lang/icc/icc-9.0.023.ebuild b/dev-lang/icc/icc-9.0.023.ebuild
deleted file mode 100644
index 162e2b4928cd..000000000000
--- a/dev-lang/icc/icc-9.0.023.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/icc-9.0.023.ebuild,v 1.3 2005/12/16 11:08:55 flameeyes Exp $
-
-inherit rpm
-
-DESCRIPTION="Intel C++ Compiler - Intel's Pentium optimized compiler for Linux"
-SRC_URI="l_cc_c_${PV}.tar.gz"
-HOMEPAGE="http://www.intel.com/software/products/compilers/clin/"
-LICENSE="icc-9.0"
-RDEPEND=">=sys-libs/glibc-2.2.5"
-SLOT="9.0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="nostrip fetch"
-S="${WORKDIR}/l_cc_c_${PV}"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S} || die
-
-	# The tarball contains rpms for multiple arches, and a lot of
-	# auxiliary rpms common across arches. We must throw away 
-	# the arch we're not.
-	case ${ARCH} in
-		amd64)
-			rm -f intel-*.{i386,ia64}.rpm
-			;;
-		ia64)
-			rm -f intel-*.{em64t,i386}.rpm
-			;;
-		x86)
-			rm -f intel-*.{em64t,ia64}.rpm
-			;;
-	esac
-
-	for x in *.rpm
-	do
-		# WORKDIR must be set properly for rpm_unpack()
-		rpm_unpack ${S}/${x}
-	done
-
-}
-
-src_compile() {
-	instdir=/opt/intel/compiler90
-
-	for x in opt/intel/*/*/bin/* ; do
-		sed "s|<INSTALLDIR>|${instdir}|g" -i $x
-	done
-
-	# == SRC_BASE
-	eval `grep "^[ ]*PACKAGEID=" ${S}/install.sh`
-
-	# From UNTAG_SUPPORT() in 'install.sh'
-	SUPPORTFILE=${S}/opt/intel/cc*/9.0/doc/csupport
-	if [ -f ${SUPPORTFILE} ]
-	then
-		einfo "Untagging: ${SUPPORTFILE}"
-		sed s@\<installpackageid\>@${PACKAGEID}@g ${SUPPORTFILE} > ${SUPPORTFILE}.abs
-		mv ${SUPPORTFILE}.abs ${SUPPORTFILE}
-		chmod 644 ${SUPPORTFILE}
-	fi
-
-	# From UNTAG_SUPPORT_IDB() in 'install.sh'
-	SUPPORTFILE=${S}/opt/intel/idb*/9.0/doc/idbsupport
-	if [ -f ${SUPPORTFILE} ]
-	then
-		einfo "Untagging: ${SUPPORTFILE}"
-		sed s@\<INSTALLTIMECOMBOPACKAGEID\>@${PACKAGEID}@g ${SUPPORTFILE} > ${SUPPORTFILE}.abs
-		mv ${SUPPORTFILE}.abs ${SUPPORTFILE}
-		chmod 644 ${SUPPORTFILE}
-	fi
-
-	# These should not be executable
-	find "${S}/opt/intel/cc*/9.0/"{doc,man,include} -type f -exec chmod -x "{}" ";"
-	find "${S}/opt/intel/cc*/9.0/lib" -name \*.a -exec chmod -x "{}" ";"
-	find "${S}/opt/intel/idb*/9.0/"{doc,man} -type f -exec chmod -x "{}" ";"
-}
-
-src_install () {
-	instdir=/opt/intel/compiler90
-	dodoc ${S}/lgpltext
-	dodoc ${S}/clicense
-	dodir ${instdir}
-	cp -pPR opt/intel/cc*/9.0/* ${D}/${instdir}
-	cp -pPR opt/intel/idb*/9.0/* ${D}/${instdir}
-	insinto /etc/env.d
-	doins ${FILESDIR}/${PVR}/05icc-ifc || die
-	exeinto ${instdir}/bin
-	doexe ${FILESDIR}/${PVR}/icc || die
-	doexe ${FILESDIR}/${PVR}/icpc || die
-}
-
-pkg_postinst () {
-	instdir=/opt/intel/compiler90
-
-	einfo "http://www.intel.com/software/products/compilers/clin/noncom.htm"
-	einfo "From the above url you can get a free, non-commercial"
-	einfo "license to use the Intel C++ Compiler emailed to you."
-	einfo "You cannot run icc without this license file."
-	einfo "Read the website for more information on this license."
-	einfo
-	einfo "Documentation can be found in ${instdir}/doc/"
-	einfo
-	einfo "You will need to place your license in ${instdir}/licenses/"
-	einfo
-
-	ewarn
-	ewarn "Packages compiled with versions of icc older than 8.0 will need"
-	ewarn "to be recompiled. Until you do that, old packages will"
-	ewarn "work if you edit /etc/ld.so.conf and change '${instdir}'"
-	ewarn "to '/opt/intel/compiler70' and run 'ldconfig.' Note that this edit"
-	ewarn "won't persist and will require you to re-edit after each"
-	ewarn "package you re-install."
-	ewarn "BEFORE COMPILING IMPORTANT APPLICATIONS THAT YOUR"
-	ewarn "SYSTEM DEPENDS ON, READ THE WARNING ABOVE."
-	ewarn "THIS COULD RENDER YOUR SYSTEM UNUSABLE."
-	ewarn "THIS IS A PROBLEM WITH INTEL'S SOFTWARE, _NOT_"
-	ewarn "WITH GENTOO."
-
-	ewarn "If 'icc' breaks, use 'iccbin' instead and report a bug."
-	ewarn "Please use 'source /etc/profile' prior to merging any icc-enabled"
-	ewarn "ebuilds."
-}
diff --git a/dev-lang/icc/icc-9.0.030.ebuild b/dev-lang/icc/icc-9.0.030.ebuild
deleted file mode 100644
index 4ef439c96122..000000000000
--- a/dev-lang/icc/icc-9.0.030.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/icc-9.0.030.ebuild,v 1.1 2006/06/05 18:04:10 spyderous Exp $
-
-inherit rpm
-
-DESCRIPTION="Intel C++ Compiler - Intel's Pentium optimized compiler for Linux"
-SRC_URI="l_cc_c_${PV}.tar.gz"
-HOMEPAGE="http://www.intel.com/software/products/compilers/clin/"
-LICENSE="icc-9.0"
-RDEPEND=">=sys-libs/glibc-2.2.5"
-SLOT="9.0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="nostrip fetch"
-S="${WORKDIR}/l_cc_c_${PV}"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S} || die
-
-	# The tarball contains rpms for multiple arches, and a lot of
-	# auxiliary rpms common across arches. We must throw away 
-	# the arch we're not.
-	case ${ARCH} in
-		amd64)
-			rm -f intel-*.{i386,ia64}.rpm
-			;;
-		ia64)
-			rm -f intel-*.{em64t,i386}.rpm
-			;;
-		x86)
-			rm -f intel-*.{em64t,ia64}.rpm
-			;;
-	esac
-
-	for x in *.rpm
-	do
-		# WORKDIR must be set properly for rpm_unpack()
-		rpm_unpack ${S}/${x}
-	done
-
-}
-
-src_compile() {
-	instdir=/opt/intel/compiler90
-
-	for x in opt/intel/*/*/bin/* ; do
-		sed "s|<INSTALLDIR>|${instdir}|g" -i $x
-	done
-
-	# == SRC_BASE
-	eval `grep "^[ ]*PACKAGEID=" ${S}/install.sh`
-
-	# From UNTAG_SUPPORT() in 'install.sh'
-	SUPPORTFILE=${S}/opt/intel/cc*/9.0/doc/csupport
-	if [ -f ${SUPPORTFILE} ]
-	then
-		einfo "Untagging: ${SUPPORTFILE}"
-		sed s@\<installpackageid\>@${PACKAGEID}@g ${SUPPORTFILE} > ${SUPPORTFILE}.abs
-		mv ${SUPPORTFILE}.abs ${SUPPORTFILE}
-		chmod 644 ${SUPPORTFILE}
-	fi
-
-	# From UNTAG_SUPPORT_IDB() in 'install.sh'
-	SUPPORTFILE=${S}/opt/intel/idb*/9.0/doc/idbsupport
-	if [ -f ${SUPPORTFILE} ]
-	then
-		einfo "Untagging: ${SUPPORTFILE}"
-		sed s@\<INSTALLTIMECOMBOPACKAGEID\>@${PACKAGEID}@g ${SUPPORTFILE} > ${SUPPORTFILE}.abs
-		mv ${SUPPORTFILE}.abs ${SUPPORTFILE}
-		chmod 644 ${SUPPORTFILE}
-	fi
-
-	# These should not be executable
-	find "${S}/opt/intel/cc*/9.0/"{doc,man,include} -type f -exec chmod -x "{}" ";"
-	find "${S}/opt/intel/cc*/9.0/lib" -name \*.a -exec chmod -x "{}" ";"
-	find "${S}/opt/intel/idb*/9.0/"{doc,man} -type f -exec chmod -x "{}" ";"
-}
-
-src_install () {
-	instdir=/opt/intel/compiler90
-	dodoc ${S}/lgpltext
-	dodoc ${S}/clicense
-	dodir ${instdir}
-	cp -pPR opt/intel/cc*/9.0/* ${D}/${instdir}
-	cp -pPR opt/intel/idb*/9.0/* ${D}/${instdir}
-	insinto /etc/env.d
-	doins ${FILESDIR}/${PVR}/05icc-ifc || die
-	exeinto ${instdir}/bin
-	doexe ${FILESDIR}/${PVR}/icc || die
-	doexe ${FILESDIR}/${PVR}/icpc || die
-}
-
-pkg_postinst () {
-	instdir=/opt/intel/compiler90
-
-	einfo "http://www.intel.com/software/products/compilers/clin/noncom.htm"
-	einfo "From the above url you can get a free, non-commercial"
-	einfo "license to use the Intel C++ Compiler emailed to you."
-	einfo "You cannot run icc without this license file."
-	einfo "Read the website for more information on this license."
-	einfo
-	einfo "Documentation can be found in ${instdir}/doc/"
-	einfo
-	einfo "You will need to place your license in ${instdir}/licenses/"
-	einfo
-
-	ewarn
-	ewarn "Packages compiled with versions of icc older than 8.0 will need"
-	ewarn "to be recompiled. Until you do that, old packages will"
-	ewarn "work if you edit /etc/ld.so.conf and change '${instdir}'"
-	ewarn "to '/opt/intel/compiler70' and run 'ldconfig.' Note that this edit"
-	ewarn "won't persist and will require you to re-edit after each"
-	ewarn "package you re-install."
-	ewarn "BEFORE COMPILING IMPORTANT APPLICATIONS THAT YOUR"
-	ewarn "SYSTEM DEPENDS ON, READ THE WARNING ABOVE."
-	ewarn "THIS COULD RENDER YOUR SYSTEM UNUSABLE."
-	ewarn "THIS IS A PROBLEM WITH INTEL'S SOFTWARE, _NOT_"
-	ewarn "WITH GENTOO."
-
-	ewarn "If 'icc' breaks, use 'iccbin' instead and report a bug."
-	ewarn "Please use 'source /etc/profile' prior to merging any icc-enabled"
-	ewarn "ebuilds."
-}
diff --git a/dev-lang/icc/icc-9.1.042.ebuild b/dev-lang/icc/icc-9.1.042.ebuild
deleted file mode 100644
index 1eaf5f7c82f8..000000000000
--- a/dev-lang/icc/icc-9.1.042.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/icc-9.1.042.ebuild,v 1.1 2006/08/28 09:14:45 dberkholz Exp $
-
-inherit rpm versionator
-
-MAJOR=$(get_major_version ${PV})
-MINOR=$(get_version_component_range 2 ${PV})
-
-DESCRIPTION="Intel C++ Compiler - Intel's Pentium optimized compiler for Linux"
-SRC_URI="l_cc_c_${PV}.tar.gz"
-HOMEPAGE="http://www.intel.com/software/products/compilers/clin/"
-LICENSE="icc-9.0"
-RDEPEND=">=sys-libs/glibc-2.2.5"
-SLOT="${MAJOR}.${MINOR}"
-MMV="${MAJOR}.${MINOR}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="nostrip fetch"
-S="${WORKDIR}/l_cc_c_${PV}"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S} || die
-
-	# The tarball contains rpms for multiple arches, and a lot of
-	# auxiliary rpms common across arches. We must throw away 
-	# the arch we're not.
-	case ${ARCH} in
-		amd64)
-			rm -f data/intel-*.{i386,ia64}.rpm
-			;;
-		ia64)
-			rm -f data/intel-*.{em64t,i386}.rpm
-			;;
-		x86)
-			rm -f data/intel-*.{em64t,ia64}.rpm
-			;;
-	esac
-
-	for x in *.rpm
-	do
-		# WORKDIR must be set properly for rpm_unpack()
-		rpm_unpack ${S}/data/${x}
-	done
-
-}
-
-src_compile() {
-	instdir=/opt/intel/compiler${MMV//.}
-
-	for x in opt/intel/*/*/bin/* ; do
-		sed "s|<INSTALLDIR>|${instdir}|g" -i $x
-	done
-
-	# == SRC_BASE
-	eval `grep "^[ ]*PACKAGEID=" ${S}/install.sh`
-
-	# From UNTAG_SUPPORT() in 'install.sh'
-	SUPPORTFILE=${S}/opt/intel/cc*/${MMV}*/doc/csupport
-	if [ -f ${SUPPORTFILE} ]
-	then
-		einfo "Untagging: ${SUPPORTFILE}"
-		sed s@\<installpackageid\>@${PACKAGEID}@g ${SUPPORTFILE} > ${SUPPORTFILE}.abs
-		mv ${SUPPORTFILE}.abs ${SUPPORTFILE}
-		chmod 644 ${SUPPORTFILE}
-	fi
-
-	# From UNTAG_SUPPORT_IDB() in 'install.sh'
-	SUPPORTFILE=${S}/opt/intel/idb*/${MMV}*/doc/idbsupport
-	if [ -f ${SUPPORTFILE} ]
-	then
-		einfo "Untagging: ${SUPPORTFILE}"
-		sed s@\<INSTALLTIMECOMBOPACKAGEID\>@${PACKAGEID}@g ${SUPPORTFILE} > ${SUPPORTFILE}.abs
-		mv ${SUPPORTFILE}.abs ${SUPPORTFILE}
-		chmod 644 ${SUPPORTFILE}
-	fi
-
-	# These should not be executable
-	find "${S}"/opt/intel/cc*/${MMV}*/{doc,man,include} -type f -exec chmod -x "{}" ";"
-	find "${S}"/opt/intel/cc*/${MMV}*/lib -name \*.a -exec chmod -x "{}" ";"
-	find "${S}"/opt/intel/idb*/${MMV}*/{doc,man} -type f -exec chmod -x "{}" ";"
-}
-
-src_install () {
-	instdir=/opt/intel/compiler${MMV//.}
-	dodoc ${S}/licenses/lgpltext
-	dodoc ${S}/clicense
-	dodir ${instdir}
-	cp -pPR opt/intel/cc*/${MMV}*/* ${D}/${instdir}
-	cp -pPR opt/intel/idb*/${MMV}*/* ${D}/${instdir}
-	insinto /etc/env.d
-	doins ${FILESDIR}/${PVR}/05icc-ifc || die
-	exeinto ${instdir}/bin
-	doexe ${FILESDIR}/${PVR}/icc || die
-	doexe ${FILESDIR}/${PVR}/icpc || die
-}
-
-pkg_postinst () {
-	instdir=/opt/intel/compiler${MMV//.}
-
-	einfo "http://www.intel.com/software/products/compilers/clin/noncom.htm"
-	einfo "From the above url you can get a free, non-commercial"
-	einfo "license to use the Intel C++ Compiler emailed to you."
-	einfo "You cannot run icc without this license file."
-	einfo "Read the website for more information on this license."
-	einfo
-	einfo "Documentation can be found in ${instdir}/doc/"
-	einfo
-	einfo "You will need to place your license in ${instdir}/licenses/"
-	einfo
-
-	ewarn
-	ewarn "Packages compiled with versions of icc older than 8.0 will need"
-	ewarn "to be recompiled. Until you do that, old packages will"
-	ewarn "work if you edit /etc/ld.so.conf and change '${instdir}'"
-	ewarn "to '/opt/intel/compiler70' and run 'ldconfig.' Note that this edit"
-	ewarn "won't persist and will require you to re-edit after each"
-	ewarn "package you re-install."
-	ewarn "BEFORE COMPILING IMPORTANT APPLICATIONS THAT YOUR"
-	ewarn "SYSTEM DEPENDS ON, READ THE WARNING ABOVE."
-	ewarn "THIS COULD RENDER YOUR SYSTEM UNUSABLE."
-	ewarn "THIS IS A PROBLEM WITH INTEL'S SOFTWARE, _NOT_"
-	ewarn "WITH GENTOO."
-
-	ewarn "If 'icc' breaks, use 'iccbin' instead and report a bug."
-	ewarn "Please use 'source /etc/profile' prior to merging any icc-enabled"
-	ewarn "ebuilds."
-}
diff --git a/dev-lang/icc/icc-9.1.044.ebuild b/dev-lang/icc/icc-9.1.044.ebuild
deleted file mode 100644
index 1d98a858afbd..000000000000
--- a/dev-lang/icc/icc-9.1.044.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/icc-9.1.044.ebuild,v 1.1 2006/11/14 21:45:09 zeypher Exp $
-
-inherit rpm versionator
-
-MAJOR=$(get_major_version ${PV})
-MINOR=$(get_version_component_range 2 ${PV})
-
-DESCRIPTION="Intel C++ Compiler - Intel's optimized compiler for Linux"
-SRC_URI="l_cc_c_${PV}.tar.gz"
-HOMEPAGE="http://www.intel.com/software/products/compilers/clin/"
-LICENSE="icc-9.0"
-RDEPEND=">=sys-libs/glibc-2.2.5"
-SLOT="${MAJOR}.${MINOR}"
-MMV="${MAJOR}.${MINOR}"
-KEYWORDS="~amd64 ~x86 ~ia64"
-IUSE=""
-RESTRICT="nostrip fetch"
-S="${WORKDIR}/l_cc_c_${PV}"
-
-pkg_nofetch() {
-	einfo "Please download ${SRC_URI} from "
-	einfo "${HOMEPAGE}"
-	einfo "and move it to ${DISTDIR}"
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S} || die
-
-	# The tarball contains rpms for multiple arches, and a lot of
-	# auxiliary rpms common across arches. We must throw away 
-	# the arch we're not.
-	case ${ARCH} in
-		amd64)
-			rm -f data/intel-*.{i386,ia64}.rpm
-			;;
-		ia64)
-			rm -f data/intel-*.{em64t,i386}.rpm
-			;;
-		x86)
-			rm -f data/intel-*.{em64t,ia64}.rpm
-			;;
-	esac
-
-	for x in *.rpm
-	do
-		# WORKDIR must be set properly for rpm_unpack()
-		rpm_unpack ${S}/data/${x}
-	done
-
-}
-
-src_compile() {
-	instdir=/opt/intel/compiler${MMV//.}
-
-	for x in opt/intel/*/*/bin/* ; do
-		sed "s|<INSTALLDIR>|${instdir}|g" -i $x
-	done
-
-	# == SRC_BASE
-	eval `grep "^[ ]*PACKAGEID=" ${S}/install.sh`
-
-	# From UNTAG_SUPPORT() in 'install.sh'
-	SUPPORTFILE=${S}/opt/intel/cc*/${MMV}*/doc/csupport
-	if [ -f ${SUPPORTFILE} ]
-	then
-		einfo "Untagging: ${SUPPORTFILE}"
-		sed s@\<installpackageid\>@${PACKAGEID}@g ${SUPPORTFILE} > ${SUPPORTFILE}.abs
-		mv ${SUPPORTFILE}.abs ${SUPPORTFILE}
-		chmod 644 ${SUPPORTFILE}
-	fi
-
-	# From UNTAG_SUPPORT_IDB() in 'install.sh'
-	SUPPORTFILE=${S}/opt/intel/idb*/${MMV}*/doc/idbsupport
-	if [ -f ${SUPPORTFILE} ]
-	then
-		einfo "Untagging: ${SUPPORTFILE}"
-		sed s@\<INSTALLTIMECOMBOPACKAGEID\>@${PACKAGEID}@g ${SUPPORTFILE} > ${SUPPORTFILE}.abs
-		mv ${SUPPORTFILE}.abs ${SUPPORTFILE}
-		chmod 644 ${SUPPORTFILE}
-	fi
-
-	# These should not be executable
-	find "${S}"/opt/intel/cc*/${MMV}*/{doc,man,include} -type f -exec chmod -x "{}" ";"
-	find "${S}"/opt/intel/cc*/${MMV}*/lib -name \*.a -exec chmod -x "{}" ";"
-	find "${S}"/opt/intel/idb*/${MMV}*/{doc,man} -type f -exec chmod -x "{}" ";"
-}
-
-src_install () {
-	instdir=/opt/intel/compiler${MMV//.}
-	dodoc ${S}/licenses/lgpltext
-	dodoc ${S}/clicense
-	dodir ${instdir}
-	cp -pPR opt/intel/cc*/${MMV}*/* ${D}/${instdir}
-	cp -pPR opt/intel/idb*/${MMV}*/* ${D}/${instdir}
-	insinto /etc/env.d
-	doins ${FILESDIR}/${PVR}/05icc-ifc || die
-	exeinto ${instdir}/bin
-	doexe ${FILESDIR}/${PVR}/icc || die
-	doexe ${FILESDIR}/${PVR}/icpc || die
-}
-
-pkg_postinst () {
-	instdir=/opt/intel/compiler${MMV//.}
-
-	einfo "http://www.intel.com/software/products/compilers/clin/noncom.htm"
-	einfo "From the above url you can get a free, non-commercial"
-	einfo "license to use the Intel C++ Compiler emailed to you."
-	einfo "You cannot run icc without this license file."
-	einfo "Read the website for more information on this license."
-	einfo
-	einfo "Documentation can be found in ${instdir}/doc/"
-	einfo
-	einfo "You will need to place your license in ${instdir}/licenses/"
-	einfo
-
-	ewarn
-	ewarn "Packages compiled with versions of icc older than 8.0 will need"
-	ewarn "to be recompiled. Until you do that, old packages will"
-	ewarn "work if you edit /etc/ld.so.conf and change '${instdir}'"
-	ewarn "to '/opt/intel/compiler70' and run 'ldconfig.' Note that this edit"
-	ewarn "won't persist and will require you to re-edit after each"
-	ewarn "package you re-install."
-	ewarn "BEFORE COMPILING IMPORTANT APPLICATIONS THAT YOUR"
-	ewarn "SYSTEM DEPENDS ON, READ THE WARNING ABOVE."
-	ewarn "THIS COULD RENDER YOUR SYSTEM UNUSABLE."
-	ewarn "THIS IS A PROBLEM WITH INTEL'S SOFTWARE, _NOT_"
-	ewarn "WITH GENTOO."
-
-	ewarn "If 'icc' breaks, use 'iccbin' instead and report a bug."
-	ewarn "Please use 'source /etc/profile' prior to merging any icc-enabled"
-	ewarn "ebuilds."
-}