Depend either on corosync or on heartbeat stack wrt bug #387581 by Jeroen Roovers <jer@gentoo.org>

Package-Manager: portage-2.2.0_alpha63/cvs/Linux x86_64

4 files changed, 26 insertions, 11 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/Manifest b/sys-cluster/pacemaker/Manifest
index b8acd500b5f7..3e2261449cea 100644
--- a/sys-cluster/pacemaker/Manifest
+++ b/sys-cluster/pacemaker/Manifest
@@ -13,14 +13,24 @@ DIST Pacemaker-1.1.4.tar.bz2 23444765 RMD160 ca2635622e2a63258d7dc9933541eb2e3b7
 DIST Pacemaker-1.1.5.tar.bz2 23531621 RMD160 56761cb9bb9aa22d0275fedc851269a5f472d29e SHA1 da8c6f09e549879961231028582fdbe69c9ac8c6 SHA256 aa1dcf2dc6deff3676fa7d0938f80bb4f163011d491d0478798e971ca2d58fb2
 EBUILD pacemaker-1.0.10.ebuild 1704 RMD160 6f11269269bf3ec33d8f9ac0ea91c3f43d273644 SHA1 8ea2440ed206ecf371ee5d2937d0589776a8008e SHA256 fc5b74f7ee393bf6875591f9a7f34b9d2fe49ba52b79d58e2ed6478bc838d28b
 EBUILD pacemaker-1.0.11.ebuild 1695 RMD160 d5fa6f353a4e7b08b3c2448068cd54b8e5aa6109 SHA1 93dfb0e07e33fdc3411121970112ca4d2b6041b3 SHA256 241df375f211ae31e5c77d17caf9b70798d90b121d47ecc31c2869a88781fab6
-EBUILD pacemaker-1.1.4-r4.ebuild 2155 RMD160 04f78cbea02a19add3a438efdda2fd9fe2b60358 SHA1 b7736c48625691174b1e6a6b825b46152b96fe46 SHA256 02220c06c7a40aac92a096011f746432450105081e6ba4fbcaa43efc4e804a08
-EBUILD pacemaker-1.1.5.ebuild 2156 RMD160 5cc65703b4799ae4d3fd0235a58ea314a1e2e437 SHA1 f0778bfb7342686f1c831176ba67eb6e86ff1b45 SHA256 b017ff418aa31497f683921aecac0931a663f56329bbd80db6f81a462c02cc81
-MISC ChangeLog 2833 RMD160 7906e655f13a2c299de7a5dc4a81211e1bbef8ef SHA1 cfc2b7b40c00e63689ce0098fb07344c3a5b5bf5 SHA256 3970c02569783a284196c230e1d27079dd6d5f519298b612a3f5900407e509d0
+EBUILD pacemaker-1.1.4-r4.ebuild 2173 RMD160 b3680ec384fa9ab27a84a614e3a54c4a6264d118 SHA1 45b6705b10cfd8f45601b30fbe84bf579d83d894 SHA256 7c8aa067a3bdbffdf29ad4e9213b37b5281c4d0308884d766c11da60dc47336b
+EBUILD pacemaker-1.1.5.ebuild 2174 RMD160 adfe3d30358c264bea2f53b7a061ba728c658ba6 SHA1 880295f039ca62aa0b7c0363a61552effb437807 SHA256 861f2c812dbcda44077669593d0b72681b93a30b798f921098dd063fde854c10
+MISC ChangeLog 3046 RMD160 5c6fc35e0386deb19c45cc4975c66ba2dd821360 SHA1 b4525c5fc6c72d051064749db2e2fd0a02a174e7 SHA256 564727694bbd46459c61a92e6b0d4bc0000f8a53239ca19d4faa833fcb757784
 MISC metadata.xml 797 RMD160 c99dc189163047b32ad1915b13e33cc01a407481 SHA1 c9a83889da12df16797e7436751e184440ef9537 SHA256 904067d2d16de829ccfc138dde85ea965db6d680b4cea293105542a5a8b9ca52
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk558/gACgkQKiQSS7ZY+hMifQD9HJNGfxRdZuC6Z780dWckPD1I
-gQ0SgSeWk2DJ18K1djYBALT/79yP/AYRPSuhwlQOkccxIo7lZMEBtPrt23tIoHwZ
-=ccBX
+iQIcBAEBCAAGBQJOncgQAAoJEF0huFKJUZL5+nwP/Ryw8F/qRFlJ37M2rb67LxAp
+4ki4xM1XmlYdaZ7hHvlgTGjp22mP6+GqpDfVh9KpHLCjAFvmqQmVkKl2pakOVuA+
+m6kTK56CIN4ofFhAI6kzIFXk3g762pFhP8bMZyAqZHGpv2OOSJ59BbZ1C1vC4xtX
+vG+6vtmsPOWi86wTNK680XKmohqQZ4HbrAvK1psIWTfHyz0nucD45cAyJTCO6QNX
+MQ1qoee7lMAlMGZq2XVE3E7FCZIfoXnglQvXJ8yr3UiNMb+ZbeTvl+O1Q+zWYvIV
+Rq3WkkPokSR73plC+rxhOPCfUsdEPihVn7Cghgdle3/Gw6HDLCaVFoPb8BrHaSYr
+wYm5ZZrZ1d1IuNIaxMR9mgOnXq7N0lNYZxsA32/i1wxE8zwqbU2QJo1gONyY+864
+4c6SQVJbFMsQXklb+dBD5naZTwbyhApV4Dfsl3d/L4Jj72pXejL9s4gqRSYHj2C7
+UMnL3ReivSwup8ovXzn2DhRYN0zSetgTdTiqSCmYVpPLSPr3/0PNf0Qkyn0Kne+T
+Xy1oOfWfvxfzuPLEcl9m1qy6mGKwoGB7DQ9PBvPcXRygTDQIl3fjZJYxlWeeGnVx
+Wtmx7KDWcPexPFs0FEArkgYyC4JwDLP/rvdL4wyIWfBBLM7mNAnCuh0dCgqDFfp5
+/V2z+FTKuSBAmoi+u7o5
+=miSY
 -----END PGP SIGNATURE-----
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 )
 "