op_list fix

Package-Manager: portage-2.1-r1

4 files changed, 38 insertions, 14 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/Manifest b/sys-cluster/heartbeat/Manifest
index 084119b45b0e..26cbf6bc3733 100644
--- a/sys-cluster/heartbeat/Manifest
+++ b/sys-cluster/heartbeat/Manifest
@@ -9,6 +9,10 @@ AUX heartbeat-1.2.3-misc_security_fixes.patch 7756 RMD160 373a1091443afdf6d2a376
 MD5 30657e79d1e3630eed837297364fe17c files/heartbeat-1.2.3-misc_security_fixes.patch 7756
 RMD160 373a1091443afdf6d2a376293b20b3e125aac982 files/heartbeat-1.2.3-misc_security_fixes.patch 7756
 SHA256 5c56152c7283f928eba5b39690bf198685447b54bcf66a25c8a9bd9543a37940 files/heartbeat-1.2.3-misc_security_fixes.patch 7756
+AUX heartbeat-2.0.4-op_list.patch 326 RMD160 c9fc0884c443b9b9df72c5278f5dab70d4fcfe60 SHA1 84df35b8671efff023adc01f997acd88c5d3dd6b SHA256 c9c128dc32155698984c5af67d50d0e32222a9ff575e00e80753b8d564963c79
+MD5 d0477f83ab923e21ff1e5770fc626672 files/heartbeat-2.0.4-op_list.patch 326
+RMD160 c9fc0884c443b9b9df72c5278f5dab70d4fcfe60 files/heartbeat-2.0.4-op_list.patch 326
+SHA256 c9c128dc32155698984c5af67d50d0e32222a9ff575e00e80753b8d564963c79 files/heartbeat-2.0.4-op_list.patch 326
 AUX heartbeat-init 1616 RMD160 2a76f26e572b0b466fa860f8eab0fad5fcb6e29f SHA1 9c20eff23ee59434b1d9f222adb587c1bc7a7e26 SHA256 98e34d2e9d6fde5e8dedb1b4d934fa39b502f2d4e603e9faa7a86b66cd0e0437
 MD5 74949e88062a20f9c6c20dd01c20533b files/heartbeat-init 1616
 RMD160 2a76f26e572b0b466fa860f8eab0fad5fcb6e29f files/heartbeat-init 1616
@@ -28,18 +32,18 @@ EBUILD heartbeat-1.2.3.ebuild 1880 RMD160 8400023513dff095beb35aece475a065527595
 MD5 89f57373b255558325c63fbdd7f578f2 heartbeat-1.2.3.ebuild 1880
 RMD160 8400023513dff095beb35aece475a06552759506 heartbeat-1.2.3.ebuild 1880
 SHA256 4cf500c1d8a3b6696a1d21776c3d8507565bfb96ca80ef0f6abccc5612f4ef52 heartbeat-1.2.3.ebuild 1880
-EBUILD heartbeat-2.0.4.ebuild 2665 RMD160 5e1731556e81335baca99a57b923ac107dd6ee8b SHA1 22d532ddc80b41c594446456508d3833ae6b82e7 SHA256 f91d456a1f37b323880fceee9f19cd811f566b2e52049ed4d9cfeea444cb1a14
-MD5 f3d0d2701f1b7ba2225320385b1f1b3f heartbeat-2.0.4.ebuild 2665
-RMD160 5e1731556e81335baca99a57b923ac107dd6ee8b heartbeat-2.0.4.ebuild 2665
-SHA256 f91d456a1f37b323880fceee9f19cd811f566b2e52049ed4d9cfeea444cb1a14 heartbeat-2.0.4.ebuild 2665
+EBUILD heartbeat-2.0.4.ebuild 2757 RMD160 7f82d35dfdd4c44a0814259d600ea21b473e872c SHA1 5c8b3b67b21764f5090cc6b7a9faa40fae51e7a4 SHA256 3579cdc946cd6c4ac0391a27f5041772744de9f0f59462be176d152d78fc4f95
+MD5 d314112d65102afeb8c0ee307a040345 heartbeat-2.0.4.ebuild 2757
+RMD160 7f82d35dfdd4c44a0814259d600ea21b473e872c heartbeat-2.0.4.ebuild 2757
+SHA256 3579cdc946cd6c4ac0391a27f5041772744de9f0f59462be176d152d78fc4f95 heartbeat-2.0.4.ebuild 2757
 EBUILD heartbeat-2.0.5.ebuild 2867 RMD160 061d1474e22aae5b502fca59cabd076c5d88fc87 SHA1 2a777db8d83ec68688f773757cdf37a98d30bf18 SHA256 34651cb4791ad7fd8ff0299a293c499cdff715144a5af4db6973e2abdafc19e8
 MD5 8fefdb5ab2e498468a2367d4283b2505 heartbeat-2.0.5.ebuild 2867
 RMD160 061d1474e22aae5b502fca59cabd076c5d88fc87 heartbeat-2.0.5.ebuild 2867
 SHA256 34651cb4791ad7fd8ff0299a293c499cdff715144a5af4db6973e2abdafc19e8 heartbeat-2.0.5.ebuild 2867
-MISC ChangeLog 7751 RMD160 c8cebe7a3639607e9b2681dc62241dbc0cd52f6c SHA1 ecf40f57951f84bd187a1c030d5caa2c17e11c44 SHA256 6484d32756a3ca9fdd2c38c34b9819a1680cfce24204df60cd00511d6b9010b5
-MD5 41b0554da51b8ce48162db805ea9f20b ChangeLog 7751
-RMD160 c8cebe7a3639607e9b2681dc62241dbc0cd52f6c ChangeLog 7751
-SHA256 6484d32756a3ca9fdd2c38c34b9819a1680cfce24204df60cd00511d6b9010b5 ChangeLog 7751
+MISC ChangeLog 7933 RMD160 c3878a0e7a8e7e678eff63d719777750f7340af8 SHA1 01ad015f66ecd16a8aaa64436b74608befab198b SHA256 1179d968c3a84e286162c409fef5940e6a1676874461e72ec645f0610e2a5bc2
+MD5 2071deb727dc629f9526b2f7bd175f55 ChangeLog 7933
+RMD160 c3878a0e7a8e7e678eff63d719777750f7340af8 ChangeLog 7933
+SHA256 1179d968c3a84e286162c409fef5940e6a1676874461e72ec645f0610e2a5bc2 ChangeLog 7933
 MISC metadata.xml 339 RMD160 503ff4e79821bcf9851a8a6f8df0d43b3be8aa99 SHA1 7af6b38347db8330de0f27dbe2677156b524ebf9 SHA256 bb453c6b308cf1dfcbd818320ea43b654620a2b28dc24296c35367d803062635
 MD5 469a4f6cad0c54b4faed31a2852af816 metadata.xml 339
 RMD160 503ff4e79821bcf9851a8a6f8df0d43b3be8aa99 metadata.xml 339
@@ -62,7 +66,7 @@ SHA256 78549687fdd2003a265f6537958824589ccda63c1c7be3dd1bf8601bfb73f164 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFEtlTxgMUyd/cdjWsRAjYrAJwMAczN/x3FhmmAbFHnZNpij1YJFgCfY7SP
-ZmujEZQGuE7Efz+zK6+m68Q=
-=TV4g
+iD8DBQFEt+bKgMUyd/cdjWsRAkakAJ4nXGIRqziRLFt+t+TQ/omnIVrXWwCfU+Xq
+/RnxqYdWiI7cmlA7xV++54Q=
+=KLq1
 -----END PGP SIGNATURE-----
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)