[gentoo-commits] proj/sci:master commit in: dev-lang/icc/

["Justin Lecher" <jlec@gentoo.org>]

commit:     22cdf8aa151b62d4c1907e1308c17e4ec5751eb5
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 21 18:41:27 2012 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Tue Feb 21 18:41:27 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=22cdf8aa

Workaround file collision, #404257

(Portage version: 2.2.0_alpha88/git/Linux x86_64, unsigned Manifest commit)

---
 dev-lang/icc/ChangeLog             |    3 +++
 dev-lang/icc/icc-12.1.7.256.ebuild |   10 ++++++++++
 2 files changed, 13 insertions(+), 0 deletions(-)

diff --git a/dev-lang/icc/ChangeLog b/dev-lang/icc/ChangeLog
index c07b485..faee556 100644
--- a/dev-lang/icc/ChangeLog
+++ b/dev-lang/icc/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  21 Feb 2012; Justin Lecher <jlec@gentoo.org> icc-12.1.7.256.ebuild:
+  Workaround file collision, #404257
+
 *icc-12.1.7.256 (16 Feb 2012)
 
   16 Feb 2012; Sébastien Fabbro <bicatali@gentoo.org> -icc-12.0.2.137.ebuild,

diff --git a/dev-lang/icc/icc-12.1.7.256.ebuild b/dev-lang/icc/icc-12.1.7.256.ebuild
index ef5059c..aa083ee 100644
--- a/dev-lang/icc/icc-12.1.7.256.ebuild
+++ b/dev-lang/icc/icc-12.1.7.256.ebuild
@@ -29,3 +29,13 @@ QA_PRESTRIPPED="${INTEL_SDP_DIR}/compiler/lib/*/.*libFNP.so"
 
 INTEL_BIN_RPMS="compilerproc compilerproc-devel"
 INTEL_DAT_RPMS="compilerproc-common"
+
+src_install() {
+	intel-sdp_src_install
+	local i
+	for i in /opt/intel/composerxe-2011.7.256/compiler/lib/{ia32,intel64}/locale/ja_JP/{diagspt,flexnet}.cat; do
+		if [[ -e "${EPREFIX}${i}" ]]; then
+			rm -rf "${ED}${i}" || die
+		fi
+	done
+}