From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Rzueq-0004Sh-W2 for garchives@archives.gentoo.org; Tue, 21 Feb 2012 18:41:49 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 62798E1399; Tue, 21 Feb 2012 18:41:41 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 35232E1399 for ; Tue, 21 Feb 2012 18:41:41 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A54821B403E for ; Tue, 21 Feb 2012 18:41:40 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 6059BE53FF for ; Tue, 21 Feb 2012 18:41:39 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <1329849687.22cdf8aa151b62d4c1907e1308c17e4ec5751eb5.jlec@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: dev-lang/icc/ X-VCS-Repository: proj/sci X-VCS-Files: dev-lang/icc/ChangeLog dev-lang/icc/icc-12.1.7.256.ebuild X-VCS-Directories: dev-lang/icc/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: 22cdf8aa151b62d4c1907e1308c17e4ec5751eb5 X-VCS-Branch: master Date: Tue, 21 Feb 2012 18:41:39 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: e3398a69-2524-4084-a81d-1506c8e7844e X-Archives-Hash: 1a9e15e47a257b3220eebf8ae8323e8f commit: 22cdf8aa151b62d4c1907e1308c17e4ec5751eb5 Author: Justin Lecher gentoo org> AuthorDate: Tue Feb 21 18:41:27 2012 +0000 Commit: Justin Lecher gentoo org> CommitDate: Tue Feb 21 18:41:27 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/sci.git;a=3Dc= ommit;h=3D22cdf8aa Workaround file collision, #404257 (Portage version: 2.2.0_alpha88/git/Linux x86_64, unsigned Manifest commi= t) --- 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: $ =20 + 21 Feb 2012; Justin Lecher icc-12.1.7.256.ebuild: + Workaround file collision, #404257 + *icc-12.1.7.256 (16 Feb 2012) =20 16 Feb 2012; S=C3=A9bastien Fabbro -icc-12.0.2.1= 37.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=3D"${INTEL_SDP_DIR}/compiler/lib/*/.*li= bFNP.so" =20 INTEL_BIN_RPMS=3D"compilerproc compilerproc-devel" INTEL_DAT_RPMS=3D"compilerproc-common" + +src_install() { + intel-sdp_src_install + local i + for i in /opt/intel/composerxe-2011.7.256/compiler/lib/{ia32,intel64}/l= ocale/ja_JP/{diagspt,flexnet}.cat; do + if [[ -e "${EPREFIX}${i}" ]]; then + rm -rf "${ED}${i}" || die + fi + done +}