summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Zoffoli <xmerlin@gentoo.org>2006-07-14 17:41:48 +0000
committerChristian Zoffoli <xmerlin@gentoo.org>2006-07-14 17:41:48 +0000
commitbbd2a17ee82b260c16e78f123f385ac76d6cc85c (patch)
tree8b579c3efe0c87dcebfb923a0677d8fda7a6e029
parentppc stable, bug #139612 (diff)
downloadgentoo-2-bbd2a17ee82b260c16e78f123f385ac76d6cc85c.tar.gz
gentoo-2-bbd2a17ee82b260c16e78f123f385ac76d6cc85c.tar.bz2
gentoo-2-bbd2a17ee82b260c16e78f123f385ac76d6cc85c.zip
op_list fix
(Portage version: 2.1-r1)
-rw-r--r--sys-cluster/heartbeat/ChangeLog6
-rw-r--r--sys-cluster/heartbeat/files/heartbeat-2.0.4-op_list.patch11
-rw-r--r--sys-cluster/heartbeat/heartbeat-2.0.4.ebuild9
3 files changed, 23 insertions, 3 deletions
diff --git a/sys-cluster/heartbeat/ChangeLog b/sys-cluster/heartbeat/ChangeLog
index a109496365e1..a3caf0533f19 100644
--- a/sys-cluster/heartbeat/ChangeLog
+++ b/sys-cluster/heartbeat/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-cluster/heartbeat
# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/ChangeLog,v 1.46 2006/07/13 13:07:20 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/ChangeLog,v 1.47 2006/07/14 17:41:48 xmerlin Exp $
+
+ 14 Jul 2006; Christian Zoffoli <xmerlin@gentoo.org>
+ +files/heartbeat-2.0.4-op_list.patch, heartbeat-2.0.4.ebuild:
+ op_list fix, thanks to Federico Cuello <fede@lugmen.org.ar>.
13 Jul 2006; Christian Zoffoli <xmerlin@gentoo.org>
heartbeat-2.0.4.ebuild, heartbeat-2.0.5.ebuild:
diff --git a/sys-cluster/heartbeat/files/heartbeat-2.0.4-op_list.patch b/sys-cluster/heartbeat/files/heartbeat-2.0.4-op_list.patch
new file mode 100644
index 000000000000..508be71d2ac3
--- /dev/null
+++ b/sys-cluster/heartbeat/files/heartbeat-2.0.4-op_list.patch
@@ -0,0 +1,11 @@
+--- heartbeat-2.0.4/lib/lrm/clientlib.c.orig 2006-07-14 20:27:35.000000000 +0200
++++ heartbeat-2.0.4/lib/lrm/clientlib.c 2006-07-14 20:36:44.000000000 +0200
+@@ -1014,7 +1014,7 @@
+ }
+ ha_msg_del(op_msg);
+ }
+- g_list_sort(op_list, compare_call_id);
++ op_list = g_list_sort(op_list, compare_call_id);
+ return op_list;
+ }
+
diff --git a/sys-cluster/heartbeat/heartbeat-2.0.4.ebuild b/sys-cluster/heartbeat/heartbeat-2.0.4.ebuild
index 717ad56c9a01..66458263d704 100644
--- a/sys-cluster/heartbeat/heartbeat-2.0.4.ebuild
+++ b/sys-cluster/heartbeat/heartbeat-2.0.4.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/heartbeat-2.0.4.ebuild,v 1.4 2006/07/13 13:07:20 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/heartbeat-2.0.4.ebuild,v 1.5 2006/07/14 17:41:48 xmerlin Exp $
-inherit flag-o-matic
+inherit flag-o-matic eutils
DESCRIPTION="Heartbeat high availability cluster manager"
HOMEPAGE="http://www.linux-ha.org"
@@ -36,6 +36,11 @@ DEPEND="
dev-lang/swig
"
+src_unpack() {
+ unpack ${A}
+ cd ${S}
+ epatch ${FILESDIR}/${P}-op_list.patch || die
+}
src_compile() {
append-ldflags $(bindnow-flags)