diff options
| -rw-r--r-- | sys-cluster/charm/ChangeLog | 7 | ||||
| -rw-r--r-- | sys-cluster/charm/charm-5.9.ebuild | 15 |
2 files changed, 11 insertions, 11 deletions
diff --git a/sys-cluster/charm/ChangeLog b/sys-cluster/charm/ChangeLog index c3b0c5d00503..ebdb53399f87 100644 --- a/sys-cluster/charm/ChangeLog +++ b/sys-cluster/charm/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-cluster/charm -# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/charm/ChangeLog,v 1.10 2007/09/22 13:09:01 markusle Exp $ +# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/charm/ChangeLog,v 1.11 2008/04/06 10:40:22 markusle Exp $ + + 06 Apr 2008; Markus Dittrich <markusle@gentoo.org> charm-5.9.ebuild: + Removed ifc use flag (see bug #97929). 22 Sep 2007; Markus Dittrich <markusle@gentoo.org> +files/charm-5.9-gcc-4.2.patch, charm-5.9.ebuild: diff --git a/sys-cluster/charm/charm-5.9.ebuild b/sys-cluster/charm/charm-5.9.ebuild index 3c62395ee410..b5457d638dda 100644 --- a/sys-cluster/charm/charm-5.9.ebuild +++ b/sys-cluster/charm/charm-5.9.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/charm/charm-5.9.ebuild,v 1.9 2007/09/22 13:09:01 markusle Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/charm/charm-5.9.ebuild,v 1.10 2008/04/06 10:40:22 markusle Exp $ inherit eutils toolchain-funcs flag-o-matic @@ -11,11 +11,11 @@ SRC_URI="${P}.tar.gz" SLOT="0" KEYWORDS="~x86" -IUSE="cmkopt tcp smp doc icc" +IUSE="cmkopt tcp smp doc" RESTRICT="fetch" -DEPEND="icc? ( >=dev-lang/icc-8.1 ) +DEPEND=" doc? ( app-text/poppler dev-tex/latex2html @@ -67,11 +67,8 @@ src_unpack() { CHARM_OPTS="${CHARM_OPTS} smp" fi - # compile with icc if requested - if use icc; then - if [ $(tc-getCC) != "icc" ]; then - die "You cannot use $(tc-getCC) with USE='icc'" - fi + # compile with icc if requested (icc or icpc) + if [ $(tc-getCC) = icc ] || [ $(tc-getCXX) = ic* ]; then CHARM_OPTS="${CHARM_OPTS} icc" fi |