diff options
author | Jeffrey Gardner <je_fro@gentoo.org> | 2009-06-02 01:31:20 +0000 |
---|---|---|
committer | Jeffrey Gardner <je_fro@gentoo.org> | 2009-06-02 01:31:20 +0000 |
commit | 3297f595a061a1cab04524c7bb11850f4ee6617c (patch) | |
tree | bc7cc7f9f81358b067ef85daadecc97c2381e0f5 /sys-cluster | |
parent | 0.5.14 bump and remove older versions. (diff) | |
download | gentoo-2-3297f595a061a1cab04524c7bb11850f4ee6617c.tar.gz gentoo-2-3297f595a061a1cab04524c7bb11850f4ee6617c.tar.bz2 gentoo-2-3297f595a061a1cab04524c7bb11850f4ee6617c.zip |
Remove icc and fix SRC_URI
(Portage version: 2.1.6.13/cvs/Linux x86_64)
Diffstat (limited to 'sys-cluster')
-rw-r--r-- | sys-cluster/charm/charm-6.1.2.ebuild | 22 | ||||
-rw-r--r-- | sys-cluster/charm/metadata.xml | 1 |
2 files changed, 5 insertions, 18 deletions
diff --git a/sys-cluster/charm/charm-6.1.2.ebuild b/sys-cluster/charm/charm-6.1.2.ebuild index ae891ea10cc8..1aa1f8bda2b9 100644 --- a/sys-cluster/charm/charm-6.1.2.ebuild +++ b/sys-cluster/charm/charm-6.1.2.ebuild @@ -1,24 +1,22 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/charm/charm-6.1.2.ebuild,v 1.3 2009/06/01 04:32:10 je_fro Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/charm/charm-6.1.2.ebuild,v 1.4 2009/06/02 01:31:20 je_fro Exp $ inherit eutils toolchain-funcs flag-o-matic multilib DESCRIPTION="Charm++ is a message-passing parallel language and runtime system." LICENSE="charm" HOMEPAGE="http://charm.cs.uiuc.edu/" -SRC_URI="${PN}_src.tar.gz" +SRC_URI="http://charm.cs.uiuc.edu/distrib/${P}_src.tar.gz" S="${WORKDIR}/${PN}" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="cmkopt tcp smp doc icc" +IUSE="cmkopt tcp smp doc" -DEPEND="icc? ( >=dev-lang/icc-8.1 ) - doc? ( - app-text/poppler +DEPEND="doc? ( app-text/poppler dev-tex/latex2html virtual/tex-base - )" + )" RDEPEND="${DEPEND}" @@ -49,16 +47,6 @@ 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 - CHARM_OPTS="${CHARM_OPTS} icc" - else - CHARM_OPTS="${CHARM_OPTS} gcc gfortran" - fi - # CMK optimization if use cmkopt; then append-flags -DCMK_OPTIMIZE=1 diff --git a/sys-cluster/charm/metadata.xml b/sys-cluster/charm/metadata.xml index 05a203d477d3..53f9cc0dcbc1 100644 --- a/sys-cluster/charm/metadata.xml +++ b/sys-cluster/charm/metadata.xml @@ -9,6 +9,5 @@ <use> <flag name='cmkopt'>Enable CMK optimisation</flag> <flag name='tcp'>Use TCP (instead of UPD) for socket communication</flag> - <flag name='icc'>Use Intel compiler to build package</flag> </use> </pkgmetadata> |