je_fro      09/06/02 01:31:20

  Modified:             metadata.xml charm-6.1.2.ebuild
  Log:
  Remove icc and fix SRC_URI
  (Portage version: 2.1.6.13/cvs/Linux x86_64)

Revision  Changes    Path
1.6                  sys-cluster/charm/metadata.xml

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/charm/metadata.xml?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/charm/metadata.xml?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/charm/metadata.xml?r1=1.5&r2=1.6

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-cluster/charm/metadata.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- metadata.xml	1 Jun 2009 04:32:10 -0000	1.5
+++ metadata.xml	2 Jun 2009 01:31:20 -0000	1.6
@@ -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>



1.4                  sys-cluster/charm/charm-6.1.2.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/charm/charm-6.1.2.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/charm/charm-6.1.2.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/charm/charm-6.1.2.ebuild?r1=1.3&r2=1.4

Index: charm-6.1.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-cluster/charm/charm-6.1.2.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- charm-6.1.2.ebuild	1 Jun 2009 04:32:10 -0000	1.3
+++ charm-6.1.2.ebuild	2 Jun 2009 01:31:20 -0000	1.4
@@ -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 @@
 		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