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 | a4427c470c0db381966f00e010536c4991f875e4 (patch) | |
| tree | 3e326f22a55a19de8b00cf6eada3e21d9bf55a32 /dev-lang/ifc | |
| parent | amd64 stable, bug #286058 (diff) | |
| download | historical-a4427c470c0db381966f00e010536c4991f875e4.tar.gz historical-a4427c470c0db381966f00e010536c4991f875e4.tar.bz2 historical-a4427c470c0db381966f00e010536c4991f875e4.zip | |
Install env file in case of absent older one, and remove a flex file to avoid collision with icc (bug #288038
Package-Manager: portage-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/Manifest | 10 | ||||
| -rw-r--r-- | dev-lang/ifc/ifc-11.1.056.ebuild | 8 |
3 files changed, 16 insertions, 8 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/Manifest b/dev-lang/ifc/Manifest index 763572af496c..f1f1967a23d0 100644 --- a/dev-lang/ifc/Manifest +++ b/dev-lang/ifc/Manifest @@ -16,13 +16,13 @@ DIST l_fc_p_10.1.018_intel64.tar.gz 45705624 RMD160 cb601b1acddc1d4548d0e622d5bf EBUILD ifc-10.0.026-r1.ebuild 3123 RMD160 ed766450a838aa285a14397f54cbedcbff6c874e SHA1 8cc097f679948f08ee70f36fcce8f8b0dd3e25e1 SHA256 4d2d11296ba662ad91d55653172156669e7e2b7063da0b51af11d0c535afd850 EBUILD ifc-10.1.017.ebuild 2870 RMD160 277110298f6d45278466d43be9c8d1c4d2115913 SHA1 138d8673edbaae4fed335cff94405f1b757b9ee7 SHA256 cb288c6ed9e9a6e0328b04a20305eb7abe06c26d54d221502227541ebe4c6e16 EBUILD ifc-10.1.018.ebuild 2870 RMD160 27ab0a0f8ed9c48e8ea7454058a882514b84ae48 SHA1 198f1e7c4c608227620dd33adfa82a0f2856ad67 SHA256 96c1ff9a65ce48758e3ed74f3a7feb241e9a47d3ae11ee1374dfc1f16666c72b -EBUILD ifc-11.1.056.ebuild 3265 RMD160 91152fec0c53957528585d7898b56b987663ee3d SHA1 82ee81bc49dffa2f0fc85b3467e3dfb527525c2e SHA256 ce17794af01e3182757e7e5964ffb36e0161717685c0fe17ab1bc04fb3b67532 -MISC ChangeLog 5686 RMD160 ad526453b1aeb6996648815a75a7dc0ea979c4ed SHA1 b32e2d4245a14fd1174e1f49365ea49504f5012c SHA256 6a3cad4ee65bbb73ff2bd024896731f9c659abf46b79f97b15f37cbb9fd47589 +EBUILD ifc-11.1.056.ebuild 3435 RMD160 7d9a4cd9e5fcaf3bb9656c5b195bf4a1377e5784 SHA1 be659daf6108fc4d44b15dcb3b7602e2cb59a50c SHA256 2a3e476e75bd3efe0213935800ecdb8dd9d549beda59cb55558ea54589f7e1e0 +MISC ChangeLog 5877 RMD160 c6fc1c079e9dafef12f9fcbacf9dec74fd28ecf5 SHA1 560f28b78cfe1e885f23b15825472af84511e35d SHA256 19765c5573e357f6fbeec568b067a4676349e37d2e9d37d3bdb2bf40f4e02e17 MISC metadata.xml 800 RMD160 9aa0b134326ad930fc30eca8d04a1b436ab28b09 SHA1 f41a78ef9756b681616a17af19acd74d3ae057f3 SHA256 0cd8e311615981457834b478c836a1eb0762439b76c267989dcf490db9c7a070 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.11 (GNU/Linux) -iEYEARECAAYFAkrLrAsACgkQ1ycZbhPLE2Df5wCePCvEaYjhmtqLOxyLhBBLTkGR -U9wAniN0C0AZreQPt9R6Vi2m0xbGTKOd -=o77K +iEYEARECAAYFAkrM7BUACgkQ1ycZbhPLE2AObgCbBLRZCcPUq7JGdMrNVodQOSmQ +D90AnR/3dN/jlaVGF+0gtr1zkQ5zrmh1 +=yNDW -----END PGP SIGNATURE----- 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 ] && \ |