diff options
| author |   Sebastien Fabbro <bicatali@gentoo.org> | 2009-10-07 19:29:16 +0000 |
|---|---|---|
| committer | Sebastien Fabbro <bicatali@gentoo.org> | 2009-10-07 19:29:16 +0000 |
| commit | 7596352b45d158f36cf238882ec396a322f6df43 (patch) | |
| tree | 4c5e922275dd8e6eb6fa2bbc6668a3dc6e1299f9 /dev-lang/ifc | |
| parent | amd64 stable, bug #286058 (diff) | |
| download | gentoo-2-7596352b45d158f36cf238882ec396a322f6df43.tar.gz gentoo-2-7596352b45d158f36cf238882ec396a322f6df43.tar.bz2 gentoo-2-7596352b45d158f36cf238882ec396a322f6df43.zip | |
Install env file in case of absent older one, and remove a flex file to avoid collision with icc (bug #288038
(Portage version: 2.2_rc44/cvs/Linux x86_64)
Diffstat (limited to 'dev-lang/ifc')
| -rw-r--r-- | dev-lang/ifc/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-lang/ifc/ifc-11.1.056.ebuild | 8 |
2 files changed, 11 insertions, 3 deletions
diff --git a/dev-lang/ifc/ChangeLog b/dev-lang/ifc/ChangeLog index 55491ade8d63..1b78167af444 100644 --- a/dev-lang/ifc/ChangeLog +++ b/dev-lang/ifc/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-lang/ifc # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/ifc/ChangeLog,v 1.50 2009/10/06 20:43:45 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/ifc/ChangeLog,v 1.51 2009/10/07 19:29:16 bicatali Exp $ + + 07 Oct 2009; Sébastien Fabbro <bicatali@gentoo.org> ifc-11.1.056.ebuild: + Install env file in case of absent older one, and remove a flex file to + avoid collision with icc (bug #288038 *ifc-11.1.056 (06 Oct 2009) diff --git a/dev-lang/ifc/ifc-11.1.056.ebuild b/dev-lang/ifc/ifc-11.1.056.ebuild index 38d3135a5a86..22f2e01f54ab 100644 --- a/dev-lang/ifc/ifc-11.1.056.ebuild +++ b/dev-lang/ifc/ifc-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/ifc/ifc-11.1.056.ebuild,v 1.1 2009/10/06 20:43:45 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/ifc/ifc-11.1.056.ebuild,v 1.2 2009/10/07 19:29:16 bicatali Exp $ EAPI=2 @@ -73,6 +73,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/icc-${PV}" && \ + rm -f ${DESTINATION}/lib/*/locale/*/flexnet.cat } src_install() { @@ -97,7 +100,8 @@ src_install() { NLSPATH="${ROOT}${DESTINATION}/lib/locale/en_US/%N" MANPATH="${ROOT}${DESTINATION}/man/en_US" EOF - if [ -n "$(diff ${ROOT}etc/env.d/${envf} ./${envf})" ]; then + if [ ! -e "${ROOT}"etc/env.d/${envf} ] || + [ -n $(diff "${ROOT}"etc/env.d/${envf} ./${envf}) ]; then doenvd ${envf} || die "doenvd ${envf} failed" fi [ -d ${DESTINATION}/idb ] && \ |