1 |
je_fro 09/06/02 01:31:20 |
2 |
|
3 |
Modified: metadata.xml charm-6.1.2.ebuild |
4 |
Log: |
5 |
Remove icc and fix SRC_URI |
6 |
(Portage version: 2.1.6.13/cvs/Linux x86_64) |
7 |
|
8 |
Revision Changes Path |
9 |
1.6 sys-cluster/charm/metadata.xml |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/charm/metadata.xml?rev=1.6&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/charm/metadata.xml?rev=1.6&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/charm/metadata.xml?r1=1.5&r2=1.6 |
14 |
|
15 |
Index: metadata.xml |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/sys-cluster/charm/metadata.xml,v |
18 |
retrieving revision 1.5 |
19 |
retrieving revision 1.6 |
20 |
diff -u -r1.5 -r1.6 |
21 |
--- metadata.xml 1 Jun 2009 04:32:10 -0000 1.5 |
22 |
+++ metadata.xml 2 Jun 2009 01:31:20 -0000 1.6 |
23 |
@@ -9,6 +9,5 @@ |
24 |
<use> |
25 |
<flag name='cmkopt'>Enable CMK optimisation</flag> |
26 |
<flag name='tcp'>Use TCP (instead of UPD) for socket communication</flag> |
27 |
- <flag name='icc'>Use Intel compiler to build package</flag> |
28 |
</use> |
29 |
</pkgmetadata> |
30 |
|
31 |
|
32 |
|
33 |
1.4 sys-cluster/charm/charm-6.1.2.ebuild |
34 |
|
35 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/charm/charm-6.1.2.ebuild?rev=1.4&view=markup |
36 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/charm/charm-6.1.2.ebuild?rev=1.4&content-type=text/plain |
37 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/charm/charm-6.1.2.ebuild?r1=1.3&r2=1.4 |
38 |
|
39 |
Index: charm-6.1.2.ebuild |
40 |
=================================================================== |
41 |
RCS file: /var/cvsroot/gentoo-x86/sys-cluster/charm/charm-6.1.2.ebuild,v |
42 |
retrieving revision 1.3 |
43 |
retrieving revision 1.4 |
44 |
diff -u -r1.3 -r1.4 |
45 |
--- charm-6.1.2.ebuild 1 Jun 2009 04:32:10 -0000 1.3 |
46 |
+++ charm-6.1.2.ebuild 2 Jun 2009 01:31:20 -0000 1.4 |
47 |
@@ -1,24 +1,22 @@ |
48 |
# Copyright 1999-2009 Gentoo Foundation |
49 |
# Distributed under the terms of the GNU General Public License v2 |
50 |
-# $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 $ |
51 |
+# $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 $ |
52 |
|
53 |
inherit eutils toolchain-funcs flag-o-matic multilib |
54 |
|
55 |
DESCRIPTION="Charm++ is a message-passing parallel language and runtime system." |
56 |
LICENSE="charm" |
57 |
HOMEPAGE="http://charm.cs.uiuc.edu/" |
58 |
-SRC_URI="${PN}_src.tar.gz" |
59 |
+SRC_URI="http://charm.cs.uiuc.edu/distrib/${P}_src.tar.gz" |
60 |
S="${WORKDIR}/${PN}" |
61 |
SLOT="0" |
62 |
KEYWORDS="~amd64 ~x86" |
63 |
-IUSE="cmkopt tcp smp doc icc" |
64 |
+IUSE="cmkopt tcp smp doc" |
65 |
|
66 |
-DEPEND="icc? ( >=dev-lang/icc-8.1 ) |
67 |
- doc? ( |
68 |
- app-text/poppler |
69 |
+DEPEND="doc? ( app-text/poppler |
70 |
dev-tex/latex2html |
71 |
virtual/tex-base |
72 |
- )" |
73 |
+ )" |
74 |
|
75 |
RDEPEND="${DEPEND}" |
76 |
|
77 |
@@ -49,16 +47,6 @@ |
78 |
CHARM_OPTS="${CHARM_OPTS} smp" |
79 |
fi |
80 |
|
81 |
- # compile with icc if requested |
82 |
- if use icc; then |
83 |
- if [ $(tc-getCC) != "icc" ]; then |
84 |
- die "You cannot use $(tc-getCC) with USE='icc'" |
85 |
- fi |
86 |
- CHARM_OPTS="${CHARM_OPTS} icc" |
87 |
- else |
88 |
- CHARM_OPTS="${CHARM_OPTS} gcc gfortran" |
89 |
- fi |
90 |
- |
91 |
# CMK optimization |
92 |
if use cmkopt; then |
93 |
append-flags -DCMK_OPTIMIZE=1 |