diff options
| -rw-r--r-- | dev-lang/icc/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-lang/icc/icc-11.1.056.ebuild | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/dev-lang/icc/ChangeLog b/dev-lang/icc/ChangeLog index 83d152d34d2f..046febcf2f7c 100644 --- a/dev-lang/icc/ChangeLog +++ b/dev-lang/icc/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-lang/icc # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/ChangeLog,v 1.74 2009/10/07 18:56:54 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/ChangeLog,v 1.75 2009/10/07 20:34:20 bicatali Exp $ + + 07 Oct 2009; Sébastien Fabbro <bicatali@gentoo.org> icc-11.1.056.ebuild: + Remove a flex file to avoid collision with icc (bug #288038) 07 Oct 2009; Sébastien Fabbro <bicatali@gentoo.org> icc-11.1.056.ebuild: Install env file in case of absent older one diff --git a/dev-lang/icc/icc-11.1.056.ebuild b/dev-lang/icc/icc-11.1.056.ebuild index 8e28d66167fa..ccbe37e1f2ed 100644 --- a/dev-lang/icc/icc-11.1.056.ebuild +++ b/dev-lang/icc/icc-11.1.056.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/icc-11.1.056.ebuild,v 1.4 2009/10/07 18:56:54 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/icc-11.1.056.ebuild,v 1.5 2009/10/07 20:34:20 bicatali Exp $ EAPI=2 @@ -95,6 +95,9 @@ src_prepare() { [ -d ${DESTINATION}/mkl ] && chmod 644 \ ${DESTINATION}/mkl/tools/{environment,builder}/* \ ${DESTINATION}/mkl/tools/plugins/*/* + # remove for collision (bug #288038) + has_version "~dev-lang/ifc-${PV}" && \ + rm -f ${DESTINATION}/lib/*/locale/*/flexnet.cat } src_install() { |