Removed unavailable 8.1.03x versions, added 8.1.028. Should fix #95750.

(Portage version: 2.0.51.19)

15 files changed, 18 insertions, 175 deletions

diff --git a/dev-lang/icc/ChangeLog b/dev-lang/icc/ChangeLog
index 6d7cea141a68..a5bfbb8d33a8 100644
--- a/dev-lang/icc/ChangeLog
+++ b/dev-lang/icc/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for dev-lang/icc
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/ChangeLog,v 1.28 2005/07/05 13:35:50 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/ChangeLog,v 1.29 2005/07/24 02:35:16 karltk Exp $
+
+*icc-8.1.028 (24 Jul 2005)
+
+  24 Jul 2005; Karl Trygve Kalleberg <karltk@gentoo.org>
+  +files/8.1.028/icpc, -files/8.1.030/05icc-ifc, -files/8.1.030/icc,
+  -files/8.1.030/iccifc.conf, -files/8.1.030/icpc, +files/8.1.028/05icc-ifc,
+  +files/8.1.028/icc, +files/8.1.028/iccifc.conf, -files/8.1.032/05icc-ifc,
+  -files/8.1.032/icc, -files/8.1.032/iccifc.conf, -files/8.1.032/icpc,
+  +icc-8.1.028.ebuild, -icc-8.1.030.ebuild, -icc-8.1.032.ebuild:
+  Removed unavailable 8.1.x versions, added the publicly available
+  8.1.028 version.
 
 *icc-9.0.021 (05 Jul 2005)
 
diff --git a/dev-lang/icc/Manifest b/dev-lang/icc/Manifest
index 1f423e67c77f..4270fbbe9fca 100644
--- a/dev-lang/icc/Manifest
+++ b/dev-lang/icc/Manifest
@@ -5,6 +5,7 @@ MD5 91f94a1c311af7f9100b209c4ac42524 icc-7.1.006.ebuild 3759
 MD5 1b8f52c5f87649ed9d30eacfcc773102 icc-6.0-r1.ebuild 3138
 MD5 2dafaea542266611f6216a992c6be2ee icc-7.0.065-r1.ebuild 3224
 MD5 7b37da228ce303fdf75decce6978b064 icc-8.1.032.ebuild 3784
+MD5 684cccb66c529924adcfa5381ea62971 icc-8.1.028.ebuild 3847
 MD5 cd7089aefd6e3109e3a1068c51a53087 icc-7.1.030.ebuild 3953
 MD5 555df8ca9389954a8d4b5c7c506484c3 icc-6.0.ebuild 2938
 MD5 6c2b65b159e2f6355037020cf5309715 icc-9.0.021.ebuild 3760
@@ -15,6 +16,7 @@ MD5 8871404a6426584a91fe924946735a62 icc-7.0.065.ebuild 3171
 MD5 f9e2f43ca6f3ea7226ea5b4d6cf8b65d icc-9.0.023.ebuild 3763
 MD5 16cb4482e4303fd7d5308782b494463d files/digest-icc-6.0 65
 MD5 451c1e8d20f20a97589c32edecbb422c files/digest-icc-8.0.055 68
+MD5 2f12c0b72e5480eb0cf6838bd14a20a7 files/digest-icc-8.1.028 70
 MD5 f95d94ed19cd410e3b5cde9a5d911f2f files/digest-icc-8.1.030 70
 MD5 7845f60233e2c235b054efe83b6b2b86 files/digest-icc-8.1.032 70
 MD5 34bb28d480d8957f9cbe47829db09907 files/digest-icc-9.0.021 69
diff --git a/dev-lang/icc/files/8.1.030/05icc-ifc b/dev-lang/icc/files/8.1.028/05icc-ifc
index 7bb8a469943f..7bb8a469943f 100644
--- a/dev-lang/icc/files/8.1.030/05icc-ifc
+++ b/dev-lang/icc/files/8.1.028/05icc-ifc
diff --git a/dev-lang/icc/files/8.1.030/icc b/dev-lang/icc/files/8.1.028/icc
index 3ea13353c745..3ea13353c745 100644
--- a/dev-lang/icc/files/8.1.030/icc
+++ b/dev-lang/icc/files/8.1.028/icc
diff --git a/dev-lang/icc/files/8.1.030/iccifc.conf b/dev-lang/icc/files/8.1.028/iccifc.conf
index 4f5d6789c65d..4f5d6789c65d 100644
--- a/dev-lang/icc/files/8.1.030/iccifc.conf
+++ b/dev-lang/icc/files/8.1.028/iccifc.conf
diff --git a/dev-lang/icc/files/8.1.030/icpc b/dev-lang/icc/files/8.1.028/icpc
index 5429f8c542b5..5429f8c542b5 100644
--- a/dev-lang/icc/files/8.1.030/icpc
+++ b/dev-lang/icc/files/8.1.028/icpc
diff --git a/dev-lang/icc/files/8.1.032/05icc-ifc b/dev-lang/icc/files/8.1.032/05icc-ifc
deleted file mode 100644
index 7bb8a469943f..000000000000
--- a/dev-lang/icc/files/8.1.032/05icc-ifc
+++ /dev/null
@@ -1,6 +0,0 @@
-IA32ROOT=/opt/intel/compiler81
-INTEL_FLEXLM_LICENSE=/opt/intel/compiler81/licenses
-LDPATH=/opt/intel/compiler81/lib
-MANPATH=/opt/intel/compiler81/man
-PATH=/opt/intel/compiler81/bin
-ROOTPATH=/opt/intel/compiler81/bin
diff --git a/dev-lang/icc/files/8.1.032/icc b/dev-lang/icc/files/8.1.032/icc
deleted file mode 100644
index 3ea13353c745..000000000000
--- a/dev-lang/icc/files/8.1.032/icc
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-export INTEL_LICENSE_FILE="/opt/intel/compiler81/licenses"
-export LD_LIBRARY_PATH="/opt/intel/compiler81/lib"
-/opt/intel/compiler81/bin/iccbin $*
diff --git a/dev-lang/icc/files/8.1.032/iccifc.conf b/dev-lang/icc/files/8.1.032/iccifc.conf
deleted file mode 100644
index 4f5d6789c65d..000000000000
--- a/dev-lang/icc/files/8.1.032/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/8.1.032/icpc b/dev-lang/icc/files/8.1.032/icpc
deleted file mode 100644
index 5429f8c542b5..000000000000
--- a/dev-lang/icc/files/8.1.032/icpc
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-export INTEL_LICENSE_FILE="/opt/intel/compiler81/licenses"
-export LD_LIBRARY_PATH="/opt/intel/compiler81/lib"
-/opt/intel/compiler81/bin/icpcbin $*
diff --git a/dev-lang/icc/files/digest-icc-8.1.028 b/dev-lang/icc/files/digest-icc-8.1.028
new file mode 100644
index 000000000000..9d4d2954a190
--- /dev/null
+++ b/dev-lang/icc/files/digest-icc-8.1.028
@@ -0,0 +1 @@
+MD5 c731762ff850020e67856980d9919030 l_cc_pc_8.1.028.tar.gz 135460369
diff --git a/dev-lang/icc/files/digest-icc-8.1.030 b/dev-lang/icc/files/digest-icc-8.1.030
deleted file mode 100644
index fa77e72cad30..000000000000
--- a/dev-lang/icc/files/digest-icc-8.1.030
+++ /dev/null
@@ -1 +0,0 @@
-MD5 355b8ed8c2390133077d5dce76d35e45 l_cc_pc_8.1.030.tar.gz 135376166
diff --git a/dev-lang/icc/files/digest-icc-8.1.032 b/dev-lang/icc/files/digest-icc-8.1.032
deleted file mode 100644
index 40bce2584ec5..000000000000
--- a/dev-lang/icc/files/digest-icc-8.1.032
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a6ca6bf933f9e39971dfa89a27963c3a l_cc_pc_8.1.032.tar.gz 135581695
diff --git a/dev-lang/icc/icc-8.1.030.ebuild b/dev-lang/icc/icc-8.1.028.ebuild
index f97ebef9e84e..da5427f3baa1 100644
--- a/dev-lang/icc/icc-8.1.030.ebuild
+++ b/dev-lang/icc/icc-8.1.028.ebuild
@@ -1,13 +1,13 @@
 # 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.030.ebuild,v 1.3 2005/05/31 19:17:51 karltk Exp $
+# $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="l_cc_pc_${PV}.tar.gz"
+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-7.0"
+LICENSE="icc-8.1"
 RDEPEND=">=sys-libs/glibc-2.2.5
 	x86? ( sys-libs/lib-compat )"
 SLOT="8.1"
@@ -37,8 +37,6 @@ src_unpack() {
 		rpm_unpack ${S}/${x}
 	done
 
-	mv ${WORKDIR}/opt ${S}/
-
 }
 
 src_compile() {
diff --git a/dev-lang/icc/icc-8.1.032.ebuild b/dev-lang/icc/icc-8.1.032.ebuild
deleted file mode 100644
index 993d1946de4e..000000000000
--- a/dev-lang/icc/icc-8.1.032.ebuild
+++ /dev/null
@@ -1,124 +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.032.ebuild,v 1.1 2005/05/31 19:17:51 karltk Exp $
-
-inherit rpm
-
-DESCRIPTION="Intel C++ Compiler - Intel's Pentium optimized compiler for Linux"
-SRC_URI="l_cc_pc_${PV}.tar.gz"
-HOMEPAGE="http://www.intel.com/software/products/compilers/clin/"
-LICENSE="icc-7.0"
-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
-
-	mv ${WORKDIR}/opt ${S}/
-
-}
-
-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."
-}