| 1 |
bicatali 09/10/07 19:29:17 |
| 2 |
|
| 3 |
Modified: ChangeLog ifc-11.1.056.ebuild |
| 4 |
Log: |
| 5 |
Install env file in case of absent older one, and 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.51 dev-lang/ifc/ChangeLog |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/ifc/ChangeLog?rev=1.51&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/ifc/ChangeLog?rev=1.51&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/ifc/ChangeLog?r1=1.50&r2=1.51 |
| 14 |
|
| 15 |
Index: ChangeLog |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/ifc/ChangeLog,v |
| 18 |
retrieving revision 1.50 |
| 19 |
retrieving revision 1.51 |
| 20 |
diff -u -r1.50 -r1.51 |
| 21 |
--- ChangeLog 6 Oct 2009 20:43:45 -0000 1.50 |
| 22 |
+++ ChangeLog 7 Oct 2009 19:29:16 -0000 1.51 |
| 23 |
@@ -1,6 +1,10 @@ |
| 24 |
# ChangeLog for dev-lang/ifc |
| 25 |
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ifc/ChangeLog,v 1.50 2009/10/06 20:43:45 bicatali Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ifc/ChangeLog,v 1.51 2009/10/07 19:29:16 bicatali Exp $ |
| 28 |
+ |
| 29 |
+ 07 Oct 2009; Sébastien Fabbro <bicatali@g.o> ifc-11.1.056.ebuild: |
| 30 |
+ Install env file in case of absent older one, and remove a flex file to |
| 31 |
+ avoid collision with icc (bug #288038 |
| 32 |
|
| 33 |
*ifc-11.1.056 (06 Oct 2009) |
| 34 |
|
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
1.2 dev-lang/ifc/ifc-11.1.056.ebuild |
| 39 |
|
| 40 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/ifc/ifc-11.1.056.ebuild?rev=1.2&view=markup |
| 41 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/ifc/ifc-11.1.056.ebuild?rev=1.2&content-type=text/plain |
| 42 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/ifc/ifc-11.1.056.ebuild?r1=1.1&r2=1.2 |
| 43 |
|
| 44 |
Index: ifc-11.1.056.ebuild |
| 45 |
=================================================================== |
| 46 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/ifc/ifc-11.1.056.ebuild,v |
| 47 |
retrieving revision 1.1 |
| 48 |
retrieving revision 1.2 |
| 49 |
diff -u -r1.1 -r1.2 |
| 50 |
--- ifc-11.1.056.ebuild 6 Oct 2009 20:43:45 -0000 1.1 |
| 51 |
+++ ifc-11.1.056.ebuild 7 Oct 2009 19:29:16 -0000 1.2 |
| 52 |
@@ -1,6 +1,6 @@ |
| 53 |
# Copyright 1999-2009 Gentoo Foundation |
| 54 |
# Distributed under the terms of the GNU General Public License v2 |
| 55 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ifc/ifc-11.1.056.ebuild,v 1.1 2009/10/06 20:43:45 bicatali Exp $ |
| 56 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ifc/ifc-11.1.056.ebuild,v 1.2 2009/10/07 19:29:16 bicatali Exp $ |
| 57 |
|
| 58 |
EAPI=2 |
| 59 |
|
| 60 |
@@ -73,6 +73,9 @@ |
| 61 |
[ -d ${DESTINATION}/mkl ] && chmod 644 \ |
| 62 |
${DESTINATION}/mkl/tools/{environment,builder}/* \ |
| 63 |
${DESTINATION}/mkl/tools/plugins/*/* |
| 64 |
+ # remove for collision (bug #288038) |
| 65 |
+ has_version "~dev-lang/icc-${PV}" && \ |
| 66 |
+ rm -f ${DESTINATION}/lib/*/locale/*/flexnet.cat |
| 67 |
} |
| 68 |
|
| 69 |
src_install() { |
| 70 |
@@ -97,7 +100,8 @@ |
| 71 |
NLSPATH="${ROOT}${DESTINATION}/lib/locale/en_US/%N" |
| 72 |
MANPATH="${ROOT}${DESTINATION}/man/en_US" |
| 73 |
EOF |
| 74 |
- if [ -n "$(diff ${ROOT}etc/env.d/${envf} ./${envf})" ]; then |
| 75 |
+ if [ ! -e "${ROOT}"etc/env.d/${envf} ] || |
| 76 |
+ [ -n $(diff "${ROOT}"etc/env.d/${envf} ./${envf}) ]; then |
| 77 |
doenvd ${envf} || die "doenvd ${envf} failed" |
| 78 |
fi |
| 79 |
[ -d ${DESTINATION}/idb ] && \ |
Archives