summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKacper Kowalik <xarthisius@gentoo.org>2010-08-28 09:16:01 +0000
committerKacper Kowalik <xarthisius@gentoo.org>2010-08-28 09:16:01 +0000
commit1d08014fde9a17e2b0de13dd0bcc5b4553b0f97f (patch)
tree1e9c1f047b499b34343e18b8025a2e25160f0049 /sys-cluster/resource-agents
parentVersion bump to latest genpatches (sec-issues) and latest tuxonice (suspends ... (diff)
downloadgentoo-2-1d08014fde9a17e2b0de13dd0bcc5b4553b0f97f.tar.gz
gentoo-2-1d08014fde9a17e2b0de13dd0bcc5b4553b0f97f.tar.bz2
gentoo-2-1d08014fde9a17e2b0de13dd0bcc5b4553b0f97f.zip
Add block against <sys-cluster/heartbeat-3.x
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Diffstat (limited to 'sys-cluster/resource-agents')
-rw-r--r--sys-cluster/resource-agents/ChangeLog6
-rw-r--r--sys-cluster/resource-agents/resource-agents-1.0.3.ebuild5
2 files changed, 8 insertions, 3 deletions
diff --git a/sys-cluster/resource-agents/ChangeLog b/sys-cluster/resource-agents/ChangeLog
index 3c3d5cdfdfc1..dc114b6aaf50 100644
--- a/sys-cluster/resource-agents/ChangeLog
+++ b/sys-cluster/resource-agents/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-cluster/resource-agents
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/resource-agents/ChangeLog,v 1.3 2010/06/29 08:31:37 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/resource-agents/ChangeLog,v 1.4 2010/08/28 09:16:01 xarthisius Exp $
+
+ 28 Aug 2010; Kacper Kowalik <xarthisius@gentoo.org>
+ resource-agents-1.0.3.ebuild:
+ Add block against <sys-cluster/heartbeat-3.x
29 Jun 2010; Guy Martin <gmsoft@gentoo.org> resource-agents-1.0.3.ebuild:
Added ~hppa to KEYWORDS.
diff --git a/sys-cluster/resource-agents/resource-agents-1.0.3.ebuild b/sys-cluster/resource-agents/resource-agents-1.0.3.ebuild
index 392ff9e0d217..c8b33f6dd358 100644
--- a/sys-cluster/resource-agents/resource-agents-1.0.3.ebuild
+++ b/sys-cluster/resource-agents/resource-agents-1.0.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/resource-agents/resource-agents-1.0.3.ebuild,v 1.3 2010/06/29 08:31:37 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/resource-agents/resource-agents-1.0.3.ebuild,v 1.4 2010/08/28 09:16:01 xarthisius Exp $
EAPI="2"
@@ -17,7 +17,8 @@ KEYWORDS="~amd64 ~hppa ~x86"
IUSE="doc"
DEPEND="sys-apps/iproute2
- sys-cluster/cluster-glue"
+ sys-cluster/cluster-glue
+ !<sys-cluster/heartbeat-3.0"
RDEPEND="${DEPEND}"
S="${WORKDIR}/Cluster-Resource-Agents-${MY_P}"