Add blocker for <sys-cluster/heartbeat-3.0

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

diff --git a/sys-cluster/cluster-glue/ChangeLog b/sys-cluster/cluster-glue/ChangeLog
index 3e97264fec9b1793e93f78a9ebc08226760fa6c8..2d42370537825cac670270c79eae32cdf2a0a60b 100644 (file)
--- a/sys-cluster/cluster-glue/ChangeLog
+++ b/sys-cluster/cluster-glue/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-cluster/cluster-glue
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cluster-glue/ChangeLog,v 1.6 2010/06/29 08:25:56 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cluster-glue/ChangeLog,v 1.7 2010/07/09 14:36:09 xarthisius Exp $
+
+  09 Jul 2010; Kacper Kowalik <xarthisius@gentoo.org>
+  cluster-glue-1.0.5.ebuild:
+  Add blocker for <sys-cluster/heartbeat-3.0
 
   29 Jun 2010; Guy Martin <gmsoft@gentoo.org> cluster-glue-1.0.5.ebuild:
   Added ~hppa to KEYWORDS.

diff --git a/sys-cluster/cluster-glue/Manifest b/sys-cluster/cluster-glue/Manifest
index 1600898e8c553919cbd02d54b65eec4234e51b9f..dce9b0c5bd2ba02c18f6538e2fdaf3c9e0b8487f 100644 (file)
--- a/sys-cluster/cluster-glue/Manifest
+++ b/sys-cluster/cluster-glue/Manifest
@@ -2,6 +2,6 @@ AUX 1.0.5-docs.patch 1329 RMD160 e3617a9ce4b9ca562328d81b4563bb2ab82324c4 SHA1 0
 AUX 1.0.5-respect_cflags.patch 287 RMD160 b61f719213f4d11fd43d9b6444201d26048de468 SHA1 e0a41227a9f463d5f431d64c240746a3587dcdd7 SHA256 be7f2c9cbfc8201118abbdb2aeb1cf6d9aca2c586ae7a6d55963ee3143d9f71e
 AUX heartbeat-logd.init 953 RMD160 7319d87e690f2309c9b76a9cd52f96c0754b5362 SHA1 cd324adbc95b65bf42eafed4a3aa6a9709395719 SHA256 c174d2767c7cee63d77436c8e533aba7d6856af398c82881c7ba3758eba38e7b
 DIST glue-1.0.5.tar.bz2 431365 RMD160 3f62d6014b3717379cd5fe8f67da91d5e1d42ac3 SHA1 44606b59a4d9ca38a1765f0589efd6e794226a86 SHA256 c437a04494850b79c094f7e84d396e917ec09d9a2fdfb7c11f3b420741ea91a2
-EBUILD cluster-glue-1.0.5.ebuild 2190 RMD160 68919d9b38b03d673a0db4a3b3dc6b31cdfa2814 SHA1 7204ade5260360a957d830bc8670f595d6ef245e SHA256 741b7142a3661a05030a91898d400e5f0dc29595c797c8a7fceb27d87c56157e
-MISC ChangeLog 1150 RMD160 b6db17a81763e26027b76db79e859f05bb044e9d SHA1 3bcb823bc331a2dfb2a59859183b2dc19e9a2495 SHA256 6dfca6c5ecb319308fff236023c67680728c8c4a59e0e06a47eceb44f9e1e36d
+EBUILD cluster-glue-1.0.5.ebuild 2223 RMD160 60f0158ffcfd999538543048ba4427d70d6e37e8 SHA1 e483745c4392abab974549d634602c07bcb376fc SHA256 7fba377b394064e944aa5429fecf59b1f0732b12cf963214e959dbb9b60a6e91
+MISC ChangeLog 1283 RMD160 1c15ed4bff81531cf6107b78c598cf90cca501fc SHA1 a449a447db67d87260027bd9a2d0d10086643931 SHA256 ab392b5b6cd2d6dba51d0f9be4a3dbfed0a3a32a9e90f67956dff931793f2e64
 MISC metadata.xml 308 RMD160 095932b8c707069c5069c288a5b9bcf146c8c863 SHA1 360fe0295835f8e00e4cdf035105e50d8b359a8a SHA256 c41cec193d39d568f83fad441120f0c7689a22a32752a833d3b2b81616fe5463

diff --git a/sys-cluster/cluster-glue/cluster-glue-1.0.5.ebuild b/sys-cluster/cluster-glue/cluster-glue-1.0.5.ebuild
index 903e0707f7156462d89e8d0a04968a6a1d721a4a..2b2c44dcbff27e6e9a05fa07ae900b7cf904597c 100644 (file)
--- a/sys-cluster/cluster-glue/cluster-glue-1.0.5.ebuild
+++ b/sys-cluster/cluster-glue/cluster-glue-1.0.5.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/cluster-glue/cluster-glue-1.0.5.ebuild,v 1.5 2010/06/29 08:25:56 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cluster-glue/cluster-glue-1.0.5.ebuild,v 1.6 2010/07/09 14:36:09 xarthisius Exp $
 
 EAPI="2"
 
@@ -22,7 +22,8 @@ RDEPEND="app-arch/bzip2
        net-misc/curl
        net-misc/iputils
        || ( net-misc/netkit-telnetd net-misc/telnet-bsd )
-       dev-libs/libxml2"
+       dev-libs/libxml2
+       !<sys-cluster/heartbeat-3.0"
 DEPEND="${RDEPEND}
        doc? (
                dev-libs/libxslt