summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Dittrich <markusle@gentoo.org>2008-04-06 10:40:22 +0000
committerMarkus Dittrich <markusle@gentoo.org>2008-04-06 10:40:22 +0000
commitb59e9c5dd48da88804818d2edd9778286c973a40 (patch)
treedf912985b17bc218fadfb255c6da7bb8d368cfc8 /sys-cluster
parentstable on amd64 (diff)
downloadhistorical-b59e9c5dd48da88804818d2edd9778286c973a40.tar.gz
historical-b59e9c5dd48da88804818d2edd9778286c973a40.tar.bz2
historical-b59e9c5dd48da88804818d2edd9778286c973a40.zip
Removed ifc use flag (see bug #97929).
Package-Manager: portage-2.1.4.4
Diffstat (limited to 'sys-cluster')
-rw-r--r--sys-cluster/charm/ChangeLog7
-rw-r--r--sys-cluster/charm/Manifest4
-rw-r--r--sys-cluster/charm/charm-5.9.ebuild15
3 files changed, 13 insertions, 13 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/Manifest b/sys-cluster/charm/Manifest
index dde6cc01a2e0..77634bb4cbe9 100644
--- a/sys-cluster/charm/Manifest
+++ b/sys-cluster/charm/Manifest
@@ -6,6 +6,6 @@ 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
-EBUILD charm-5.9.ebuild 3760 RMD160 258fc573dd3d633aad85255527d2f87db49172f3 SHA1 46580b58ed26bfadd19717c3e8fe93028abb8aac SHA256 b2aad58b2cb5555ee163811593436f7dc590ef1ac63ab469552786563a4e633a
-MISC ChangeLog 2268 RMD160 94ef592114012b9fd664129beff977c34e363f12 SHA1 1c0969c1c8584a6f6575929d76eb13069d5fcbaa SHA256 315dadda007fed580c1b8b1027ec18836d45f230d8e9972ece1b1def919d2445
+EBUILD charm-5.9.ebuild 3692 RMD160 71b30ca52540b682a8bfdab3ecfdd70cae55ea0c SHA1 5248565da23207034b57c0e4b08b21f26e429646 SHA256 5182dea68f04b0f3e34aa31def39a67eb324c4bb490b9938581d5c866047ef71
+MISC ChangeLog 2381 RMD160 a714da3a1f12b24c39aff836b6cd8e2702d177b2 SHA1 12532d0ce4484239f785074976f1dc8e1313e9d2 SHA256 770d787041bdefb26f89c45ff5ec51ecc3c8d2c48a4f4acac0fcda9784505db0
MISC metadata.xml 254 RMD160 991c43f74018cbcaaa60b41290c912a8b61091c8 SHA1 83928b80dc644941d59b64e04e0964b1c1fa3005 SHA256 80784c7acbd54102b4d3fc01c3fb2ae5862732093798671596c67a8350c25454
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