summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKacper Kowalik <xarthisius@gentoo.org>2011-10-18 18:40:04 +0000
committerKacper Kowalik <xarthisius@gentoo.org>2011-10-18 18:40:04 +0000
commitb21cdd2676995b552f56525b8732b143a3b8f4a5 (patch)
tree4b98af63e259147df7cfae3f6dad7e1bdb1b01e0 /sys-cluster/pacemaker
parentFix gdk-pixbuf dependency (bug #387041 by Jack Lloyd), update homepage as old... (diff)
downloadgentoo-2-b21cdd2676995b552f56525b8732b143a3b8f4a5.tar.gz
gentoo-2-b21cdd2676995b552f56525b8732b143a3b8f4a5.tar.bz2
gentoo-2-b21cdd2676995b552f56525b8732b143a3b8f4a5.zip
Depend either on corosync or on heartbeat stack wrt bug #387581 by Jeroen Roovers <jer@gentoo.org>
(Portage version: 2.2.0_alpha63/cvs/Linux x86_64)
Diffstat (limited to 'sys-cluster/pacemaker')
-rw-r--r--sys-cluster/pacemaker/ChangeLog7
-rw-r--r--sys-cluster/pacemaker/pacemaker-1.1.4-r4.ebuild4
-rw-r--r--sys-cluster/pacemaker/pacemaker-1.1.5.ebuild4
3 files changed, 10 insertions, 5 deletions
diff --git a/sys-cluster/pacemaker/ChangeLog b/sys-cluster/pacemaker/ChangeLog
index fbe1ce04892a..216deeccb111 100644
--- a/sys-cluster/pacemaker/ChangeLog
+++ b/sys-cluster/pacemaker/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for sys-cluster/pacemaker
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker/ChangeLog,v 1.15 2011/09/21 14:25:51 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker/ChangeLog,v 1.16 2011/10/18 18:40:04 xarthisius Exp $
+
+ 18 Oct 2011; Kacper Kowalik <xarthisius@gentoo.org>
+ pacemaker-1.1.4-r4.ebuild, pacemaker-1.1.5.ebuild:
+ Depend either on corosync or on heartbeat stack wrt bug #387581 by Jeroen
+ Roovers <jer@gentoo.org>
21 Sep 2011; Ultrabug <ultrabug@gentoo.org> pacemaker-1.1.5.ebuild:
Fix missing dep #382957, thanks to Guillaume Chanaud.
diff --git a/sys-cluster/pacemaker/pacemaker-1.1.4-r4.ebuild b/sys-cluster/pacemaker/pacemaker-1.1.4-r4.ebuild
index eded154e4cda..74b8a5556c9b 100644
--- a/sys-cluster/pacemaker/pacemaker-1.1.4-r4.ebuild
+++ b/sys-cluster/pacemaker/pacemaker-1.1.4-r4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker/pacemaker-1.1.4-r4.ebuild,v 1.1 2011/02/21 14:39:27 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker/pacemaker-1.1.4-r4.ebuild,v 1.2 2011/10/18 18:40:04 xarthisius Exp $
EAPI="2"
@@ -20,10 +20,10 @@ IUSE="heartbeat smtp snmp static-libs"
RDEPEND="
dev-libs/libxslt
- sys-cluster/corosync
sys-cluster/cluster-glue
sys-cluster/resource-agents
heartbeat? ( >=sys-cluster/heartbeat-3.0.0 )
+ !heartbeat? ( sys-cluster/corosync )
smtp? ( net-libs/libesmtp )
snmp? ( net-analyzer/net-snmp )
"
diff --git a/sys-cluster/pacemaker/pacemaker-1.1.5.ebuild b/sys-cluster/pacemaker/pacemaker-1.1.5.ebuild
index 92d431d37252..ff13f47aa083 100644
--- a/sys-cluster/pacemaker/pacemaker-1.1.5.ebuild
+++ b/sys-cluster/pacemaker/pacemaker-1.1.5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker/pacemaker-1.1.5.ebuild,v 1.3 2011/09/21 14:25:51 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker/pacemaker-1.1.5.ebuild,v 1.4 2011/10/18 18:40:04 xarthisius Exp $
EAPI=3
@@ -22,10 +22,10 @@ IUSE="acl heartbeat smtp snmp static-libs"
DEPEND="
app-text/docbook-xsl-stylesheets
dev-libs/libxslt
- sys-cluster/corosync
sys-cluster/cluster-glue
sys-cluster/resource-agents
heartbeat? ( >=sys-cluster/heartbeat-3.0.0 )
+ !heartbeat? ( sys-cluster/corosync )
smtp? ( net-libs/libesmtp )
snmp? ( net-analyzer/net-snmp )
"