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 | e806f79c48697648fe87de02c0970c244866b76b (patch) | |
| tree | 031355af83c3ce32f7d1ffabb565fdb82a8f6b21 | |
| parent | 0.5.14 bump and remove older versions. (diff) | |
| download | historical-e806f79c48697648fe87de02c0970c244866b76b.tar.gz historical-e806f79c48697648fe87de02c0970c244866b76b.tar.bz2 historical-e806f79c48697648fe87de02c0970c244866b76b.zip | |
Remove icc and fix SRC_URI
Package-Manager: portage-2.1.6.13/cvs/Linux x86_64
| -rw-r--r-- | sys-cluster/charm/Manifest | 6 | ||||
| -rw-r--r-- | sys-cluster/charm/charm-6.1.2.ebuild | 22 | ||||
| -rw-r--r-- | sys-cluster/charm/metadata.xml | 1 |
3 files changed, 8 insertions, 21 deletions
diff --git a/sys-cluster/charm/Manifest b/sys-cluster/charm/Manifest index b2aa55830ab4..a3e3e3204957 100644 --- a/sys-cluster/charm/Manifest +++ b/sys-cluster/charm/Manifest @@ -8,8 +8,8 @@ AUX charm-examples-gentoo.patch 3920 RMD160 d038f9e2f32db47a6f335c92dd73e727a54d AUX charm-fpic-gentoo.patch 963 RMD160 d725ce4085638996244db909d4b30ce0e5623bce SHA1 02e80605505bf1aa3ec371643b165f3890ba0cc1 SHA256 e02cc065399771a3f6e2946446fc47809df1eae6fa40a9bc00b1947805a2f5ec AUX charm-python-configure-gentoo.patch 984 RMD160 fb7f9279e528d3e74756c734c6837379f50148e2 SHA1 3a7e9e81b9f4019aad643e5fe68093f185b8229f SHA256 df476e74c78d2a2c03c9619a8d90e81c60c125e7cbf514f3ff27375d8469130d DIST charm-5.9.tar.gz 7580639 RMD160 ebc3a8515fd918c6e0fc0fd9963a22b3ae5d057d SHA1 8b34d083486e6350ddf31a71e7476d6027ef9c0f SHA256 b5f8d53f0b447dbd720a0f2607a0e7902c227c7377326bf279e448ed570dcc89 -DIST charm_src.tar.gz 23903605 RMD160 6a4ec1e725001073903de0241f23c7e53cdb5e97 SHA1 0443fe79a4d7f489c227316a50927ed9c71685d5 SHA256 d30a6d069d334760fcf919d1f6dba3ac76b64336fe7570e43f91af8de5b21839 +DIST charm-6.1.2_src.tar.gz 24177223 RMD160 bdd6e88a8596139303025d5ecd484a4634811dc9 SHA1 0e6cee877f22794cb647ab22ef5651048abcbbd0 SHA256 cc8a522ddf495fdd44f8134d82dfe0a17b72c2cf5962960688463d3115e8e366 EBUILD charm-5.9.ebuild 3825 RMD160 aab9026110c2eb0b4d979b8f1d5e35496be9ebb7 SHA1 2160b0bcd683cf03443f403afbb293cc144b408f SHA256 a0e46b1177cb2a916e55e0a1a8b8bcf9829900f134812a7e7303d0bc0f59166a -EBUILD charm-6.1.2.ebuild 3350 RMD160 7dacd4d7b8365ad9de268ac200a487bab3bc483b SHA1 cbb14d4c50da587bf57bb996d73a41968d2eebe1 SHA256 7c3138a8e916779c5a4771958402ef982881f9eab32ec76ff5aa9c224754c66d +EBUILD charm-6.1.2.ebuild 3119 RMD160 ccc105f088ba63514dd0b14db027ca2611fe088f SHA1 0ff297bc78f745e5c1ac33c6a893584f7566be98 SHA256 adcf05899b6eb387c9f280e2cc341e4cd7be5ca3be9d7034d64239e1a7bc7463 MISC ChangeLog 3395 RMD160 54cfd98aedfbe5d4a14d2b26461cf46a6e196f78 SHA1 ecc6c3004f9f98c141b51c28c10d0836c2fe383a SHA256 76e1d179370dc45c77db900bff38e4c08090a29b8e47be8d5e41019e9e1ccc3f -MISC metadata.xml 460 RMD160 11ff40d5340bb2588f78916b032a4247d6b6f8f0 SHA1 64fbf618bbee100ebdfc4857d9c4b0dc99ebdefc SHA256 8382bb1e6bdaf9e733a036c07258ee70a02cac03892e2bd4a456f6b70d832797 +MISC metadata.xml 398 RMD160 bf40832b2220f644b2d56f653a41f047d0184b85 SHA1 9782cf178225fb5944bc6612076ff81c2512c842 SHA256 bc7d0905ab52e35d45967685ef8106826e8bfaacc7a0f58ae652fdb2b863e33d 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> |