From: "Sebastien Fabbro (bicatali)" <bicatali@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] gentoo-x86 commit in dev-lang/icc: ChangeLog icc-11.1.056.ebuild
Date: Wed, 07 Oct 2009 20:34:20 +0000 [thread overview]
Message-ID: <E1MvdDI-0000Bm-Pu@stork.gentoo.org> (raw)
bicatali 09/10/07 20:34:20
Modified: ChangeLog icc-11.1.056.ebuild
Log:
Remove a flex file to avoid collision with icc (bug #288038)
(Portage version: 2.2_rc44/cvs/Linux x86_64)
Revision Changes Path
1.75 dev-lang/icc/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/icc/ChangeLog?rev=1.75&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/icc/ChangeLog?rev=1.75&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/icc/ChangeLog?r1=1.74&r2=1.75
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/icc/ChangeLog,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- ChangeLog 7 Oct 2009 18:56:54 -0000 1.74
+++ ChangeLog 7 Oct 2009 20:34:20 -0000 1.75
@@ -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
1.5 dev-lang/icc/icc-11.1.056.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/icc/icc-11.1.056.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/icc/icc-11.1.056.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/icc/icc-11.1.056.ebuild?r1=1.4&r2=1.5
Index: icc-11.1.056.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/icc/icc-11.1.056.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- icc-11.1.056.ebuild 7 Oct 2009 18:56:54 -0000 1.4
+++ icc-11.1.056.ebuild 7 Oct 2009 20:34:20 -0000 1.5
@@ -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 @@
[ -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() {
next reply other threads:[~2009-10-07 20:34 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-10-07 20:34 Sebastien Fabbro (bicatali) [this message]
-- strict thread matches above, loose matches on Subject: below --
2009-10-08 3:48 [gentoo-commits] gentoo-x86 commit in dev-lang/icc: ChangeLog icc-11.1.056.ebuild Sebastien Fabbro (bicatali)
2009-10-07 18:56 Sebastien Fabbro (bicatali)
2009-10-07 18:54 Sebastien Fabbro (bicatali)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=E1MvdDI-0000Bm-Pu@stork.gentoo.org \
--to=bicatali@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox