| 1 |
bicatali 09/10/07 20:34:20 |
| 2 |
|
| 3 |
Modified: ChangeLog icc-11.1.056.ebuild |
| 4 |
Log: |
| 5 |
Remove a flex file to avoid collision with icc (bug #288038) |
| 6 |
(Portage version: 2.2_rc44/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.75 dev-lang/icc/ChangeLog |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/icc/ChangeLog?rev=1.75&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/icc/ChangeLog?rev=1.75&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/icc/ChangeLog?r1=1.74&r2=1.75 |
| 14 |
|
| 15 |
Index: ChangeLog |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/icc/ChangeLog,v |
| 18 |
retrieving revision 1.74 |
| 19 |
retrieving revision 1.75 |
| 20 |
diff -u -r1.74 -r1.75 |
| 21 |
--- ChangeLog 7 Oct 2009 18:56:54 -0000 1.74 |
| 22 |
+++ ChangeLog 7 Oct 2009 20:34:20 -0000 1.75 |
| 23 |
@@ -1,6 +1,9 @@ |
| 24 |
# ChangeLog for dev-lang/icc |
| 25 |
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/ChangeLog,v 1.74 2009/10/07 18:56:54 bicatali Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/ChangeLog,v 1.75 2009/10/07 20:34:20 bicatali Exp $ |
| 28 |
+ |
| 29 |
+ 07 Oct 2009; Sébastien Fabbro <bicatali@g.o> icc-11.1.056.ebuild: |
| 30 |
+ Remove a flex file to avoid collision with icc (bug #288038) |
| 31 |
|
| 32 |
07 Oct 2009; Sébastien Fabbro <bicatali@g.o> icc-11.1.056.ebuild: |
| 33 |
Install env file in case of absent older one |
| 34 |
|
| 35 |
|
| 36 |
|
| 37 |
1.5 dev-lang/icc/icc-11.1.056.ebuild |
| 38 |
|
| 39 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/icc/icc-11.1.056.ebuild?rev=1.5&view=markup |
| 40 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/icc/icc-11.1.056.ebuild?rev=1.5&content-type=text/plain |
| 41 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/icc/icc-11.1.056.ebuild?r1=1.4&r2=1.5 |
| 42 |
|
| 43 |
Index: icc-11.1.056.ebuild |
| 44 |
=================================================================== |
| 45 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/icc/icc-11.1.056.ebuild,v |
| 46 |
retrieving revision 1.4 |
| 47 |
retrieving revision 1.5 |
| 48 |
diff -u -r1.4 -r1.5 |
| 49 |
--- icc-11.1.056.ebuild 7 Oct 2009 18:56:54 -0000 1.4 |
| 50 |
+++ icc-11.1.056.ebuild 7 Oct 2009 20:34:20 -0000 1.5 |
| 51 |
@@ -1,6 +1,6 @@ |
| 52 |
# Copyright 1999-2009 Gentoo Foundation |
| 53 |
# Distributed under the terms of the GNU General Public License v2 |
| 54 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/icc-11.1.056.ebuild,v 1.4 2009/10/07 18:56:54 bicatali Exp $ |
| 55 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/icc-11.1.056.ebuild,v 1.5 2009/10/07 20:34:20 bicatali Exp $ |
| 56 |
|
| 57 |
EAPI=2 |
| 58 |
|
| 59 |
@@ -95,6 +95,9 @@ |
| 60 |
[ -d ${DESTINATION}/mkl ] && chmod 644 \ |
| 61 |
${DESTINATION}/mkl/tools/{environment,builder}/* \ |
| 62 |
${DESTINATION}/mkl/tools/plugins/*/* |
| 63 |
+ # remove for collision (bug #288038) |
| 64 |
+ has_version "~dev-lang/ifc-${PV}" && \ |
| 65 |
+ rm -f ${DESTINATION}/lib/*/locale/*/flexnet.cat |
| 66 |
} |
| 67 |
|
| 68 |
src_install() { |
Archives