Added GUI support, fixed bug #131514. Thanks to Neil Katin <gentoo@askneil.com>. Improved init script, fixed bug #133170. Thanks to Petre Rodan <kaiowas@gentoo.org>.

Package-Manager: portage-2.1-r1

9 files changed, 226 insertions, 49 deletions

diff --git a/sys-cluster/heartbeat/ChangeLog b/sys-cluster/heartbeat/ChangeLog
index 2171c5c8e56f..ae44ad56073b 100644
--- a/sys-cluster/heartbeat/ChangeLog
+++ b/sys-cluster/heartbeat/ChangeLog
@@ -1,6 +1,13 @@
 # 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.44 2006/04/15 16:03:45 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/ChangeLog,v 1.45 2006/07/13 12:52:23 xmerlin Exp $
+
+*heartbeat-2.0.5 (13 Jul 2006)
+
+  13 Jul 2006; Christian Zoffoli <xmerlin@gentoo.org> files/heartbeat-init,
+  +heartbeat-2.0.5.ebuild:
+  Added GUI support, fixed bug #131514. Thanks to Neil Katin <gentoo@askneil.com>.
+  Improved init script, fixed bug #133170. Thanks to Petre Rodan <kaiowas@gentoo.org>.
 
   15 Apr 2006; Christian Zoffoli <xmerlin@gentoo.org>
   heartbeat-2.0.4.ebuild:
diff --git a/sys-cluster/heartbeat/Manifest b/sys-cluster/heartbeat/Manifest
index ad21c94a1da9..3d9205e24863 100644
--- a/sys-cluster/heartbeat/Manifest
+++ b/sys-cluster/heartbeat/Manifest
@@ -1,64 +1,68 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX heartbeat-1.2.3-lvm.patch 1660 RMD160 51a306157b3b17deb5f54bf3a888a39058022c94 SHA1 5cf699b3e83c0d29ed001fbef0b1e81ea784ad9d SHA256 43b7751eae64fa2ec8dd4ed3c38c43acfff46a7d572fb5dd953f55719441ba4b size 1660
+AUX heartbeat-1.2.3-lvm.patch 1660 RMD160 51a306157b3b17deb5f54bf3a888a39058022c94 SHA1 5cf699b3e83c0d29ed001fbef0b1e81ea784ad9d SHA256 43b7751eae64fa2ec8dd4ed3c38c43acfff46a7d572fb5dd953f55719441ba4b
 MD5 4382b0b2d64b5483957114b7123e4a94 files/heartbeat-1.2.3-lvm.patch 1660
 RMD160 51a306157b3b17deb5f54bf3a888a39058022c94 files/heartbeat-1.2.3-lvm.patch 1660
 SHA256 43b7751eae64fa2ec8dd4ed3c38c43acfff46a7d572fb5dd953f55719441ba4b files/heartbeat-1.2.3-lvm.patch 1660
-AUX heartbeat-1.2.3-misc_security_fixes.patch 7756 RMD160 373a1091443afdf6d2a376293b20b3e125aac982 SHA1 9da2d220e845dc85c9a75bfda0f94e63e86e249e SHA256 5c56152c7283f928eba5b39690bf198685447b54bcf66a25c8a9bd9543a37940 size 7756
+AUX heartbeat-1.2.3-misc_security_fixes.patch 7756 RMD160 373a1091443afdf6d2a376293b20b3e125aac982 SHA1 9da2d220e845dc85c9a75bfda0f94e63e86e249e SHA256 5c56152c7283f928eba5b39690bf198685447b54bcf66a25c8a9bd9543a37940
 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-init 821 RMD160 31e45797c2c9f08e23845262f3afd26aa8c8d8a1 SHA1 19710874f56041f0eb39ac2287aa3f3883c2e8f5 SHA256 f478a656df5ebd43ae2612a9dacb54aeb2fe25e30dca989335d31a94a1fea5bf size 821
-MD5 343f80e3711eec80114c5ca01d38b8b0 files/heartbeat-init 821
-RMD160 31e45797c2c9f08e23845262f3afd26aa8c8d8a1 files/heartbeat-init 821
-SHA256 f478a656df5ebd43ae2612a9dacb54aeb2fe25e30dca989335d31a94a1fea5bf files/heartbeat-init 821
-DIST heartbeat-1.2.3.tar.gz 1772513 size 1772513
-DIST heartbeat-2.0.4.tar.gz 2807110 size 2807110
-EBUILD heartbeat-1.2.3-r1.ebuild 2100 RMD160 ad770c6f19db4f66464fb9607cacac15be85993a SHA1 fe084e17812f5147a6ff6188fb4a95e5a901734f SHA256 4a9cd43da95d4acc27ef2052834455b7204478db711057f01ea704db2418a4b2 size 2100
+AUX heartbeat-init 1616 RMD160 2a76f26e572b0b466fa860f8eab0fad5fcb6e29f SHA1 9c20eff23ee59434b1d9f222adb587c1bc7a7e26 SHA256 98e34d2e9d6fde5e8dedb1b4d934fa39b502f2d4e603e9faa7a86b66cd0e0437
+MD5 74949e88062a20f9c6c20dd01c20533b files/heartbeat-init 1616
+RMD160 2a76f26e572b0b466fa860f8eab0fad5fcb6e29f files/heartbeat-init 1616
+SHA256 98e34d2e9d6fde5e8dedb1b4d934fa39b502f2d4e603e9faa7a86b66cd0e0437 files/heartbeat-init 1616
+DIST heartbeat-1.2.3.tar.gz 1772513 RMD160 f2d7b58e862c7bef3ee7d8a0421744fcd35544c2 SHA1 e3ea8f25e4d5d453f91a86ce5e4ac48e8d4e945e SHA256 44a2e7b3cea825f873d47366f02ff51a8aaab320d51618e959fa2c6a5cbf3ed2
+DIST heartbeat-2.0.4.tar.gz 2807110 RMD160 94ff6d018253c29bee876bc5063ab1072b51091d SHA1 470fcc7cdc1a2f1dd3db6e7bfa1ce9a3b806c987 SHA256 334a3df02cdba3f1ef5f0ff60be54702928c54b40a5623cd55150b2a2d5d079f
+DIST heartbeat-2.0.5.tar.gz 2837784 RMD160 38591600953fe225ba9c548fd63b328f7e344da3 SHA1 6b55d9caf3f3631a548f9601cbd73d903635ce83 SHA256 55565e61d991dd6b902b6b842321b6f33dd24ab4025cbd8bc72ae8b18e68e2b9
+EBUILD heartbeat-1.2.3-r1.ebuild 2100 RMD160 ad770c6f19db4f66464fb9607cacac15be85993a SHA1 fe084e17812f5147a6ff6188fb4a95e5a901734f SHA256 4a9cd43da95d4acc27ef2052834455b7204478db711057f01ea704db2418a4b2
 MD5 4a49236960a441f4fecb1530de623e76 heartbeat-1.2.3-r1.ebuild 2100
 RMD160 ad770c6f19db4f66464fb9607cacac15be85993a heartbeat-1.2.3-r1.ebuild 2100
 SHA256 4a9cd43da95d4acc27ef2052834455b7204478db711057f01ea704db2418a4b2 heartbeat-1.2.3-r1.ebuild 2100
-EBUILD heartbeat-1.2.3-r2.ebuild 2154 RMD160 6d6d68390bcac5b14faf8d4d1fece1242e19382e SHA1 949bd104fb51b9ed7137aea863f4e4aea3d2438c SHA256 eaf875004987a4a2e8a66e075520376f24d49a12d62ab794a3cb73fac17647bc size 2154
+EBUILD heartbeat-1.2.3-r2.ebuild 2154 RMD160 6d6d68390bcac5b14faf8d4d1fece1242e19382e SHA1 949bd104fb51b9ed7137aea863f4e4aea3d2438c SHA256 eaf875004987a4a2e8a66e075520376f24d49a12d62ab794a3cb73fac17647bc
 MD5 f2b532351a9e4594ec5489b3855a2737 heartbeat-1.2.3-r2.ebuild 2154
 RMD160 6d6d68390bcac5b14faf8d4d1fece1242e19382e heartbeat-1.2.3-r2.ebuild 2154
 SHA256 eaf875004987a4a2e8a66e075520376f24d49a12d62ab794a3cb73fac17647bc heartbeat-1.2.3-r2.ebuild 2154
-EBUILD heartbeat-1.2.3.ebuild 1880 RMD160 8400023513dff095beb35aece475a06552759506 SHA1 cf546fd7664ffbb0b7c412d436e81366fb696bd4 SHA256 4cf500c1d8a3b6696a1d21776c3d8507565bfb96ca80ef0f6abccc5612f4ef52 size 1880
+EBUILD heartbeat-1.2.3.ebuild 1880 RMD160 8400023513dff095beb35aece475a06552759506 SHA1 cf546fd7664ffbb0b7c412d436e81366fb696bd4 SHA256 4cf500c1d8a3b6696a1d21776c3d8507565bfb96ca80ef0f6abccc5612f4ef52
 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 2664 RMD160 95e5b03413c89059c70066a9cf382ef93836c266 SHA1 90d5b7593ac520dbea6d0229595a7d87b8abb463 SHA256 916dcc16e48e3cd7f8c489e36a5c7a5af2595a88158b0ba2fb28595927b6ecbd size 2664
+EBUILD heartbeat-2.0.4.ebuild 2664 RMD160 95e5b03413c89059c70066a9cf382ef93836c266 SHA1 90d5b7593ac520dbea6d0229595a7d87b8abb463 SHA256 916dcc16e48e3cd7f8c489e36a5c7a5af2595a88158b0ba2fb28595927b6ecbd
 MD5 7758875c1a9e5f1d66933e6dbe1b8905 heartbeat-2.0.4.ebuild 2664
 RMD160 95e5b03413c89059c70066a9cf382ef93836c266 heartbeat-2.0.4.ebuild 2664
 SHA256 916dcc16e48e3cd7f8c489e36a5c7a5af2595a88158b0ba2fb28595927b6ecbd heartbeat-2.0.4.ebuild 2664
-MISC ChangeLog 7241 RMD160 40d0d1b4d909e2d75a8e23a7037c6dafcab93bef SHA1 9ce747bcfd8d020036fd17adbf6310818e9107fc SHA256 e55b7ddf6b1fdfd9467590179f5857f42dafc5c97f72c9d78cd037b3fb9ef686 size 7241
-MD5 397a698313fdb032e973b37771f2773f ChangeLog 7241
-RMD160 40d0d1b4d909e2d75a8e23a7037c6dafcab93bef ChangeLog 7241
-SHA256 e55b7ddf6b1fdfd9467590179f5857f42dafc5c97f72c9d78cd037b3fb9ef686 ChangeLog 7241
-MISC metadata.xml 339 RMD160 503ff4e79821bcf9851a8a6f8df0d43b3be8aa99 SHA1 7af6b38347db8330de0f27dbe2677156b524ebf9 SHA256 bb453c6b308cf1dfcbd818320ea43b654620a2b28dc24296c35367d803062635 size 339
+EBUILD heartbeat-2.0.5.ebuild 2867 RMD160 1c0c1f852ff26a640af10e1de84546bfe6e98b41 SHA1 325f5bb37241ddc13758c3d9db0252884eb038da SHA256 ee60426cee373455faf050b8f288079d186f176e5e6f555b088be719f346a991
+MD5 9b6e86111302488ac37e857853ab8136 heartbeat-2.0.5.ebuild 2867
+RMD160 1c0c1f852ff26a640af10e1de84546bfe6e98b41 heartbeat-2.0.5.ebuild 2867
+SHA256 ee60426cee373455faf050b8f288079d186f176e5e6f555b088be719f346a991 heartbeat-2.0.5.ebuild 2867
+MISC ChangeLog 7547 RMD160 c589cad97410546b5c0388ad9cb6b717a026a7de SHA1 d9052626a611793873654879c48189f982007cc7 SHA256 d2b7e308d92466786fe81d68e9ac9172a5302a40893518c573bdfa85eec4bdef
+MD5 ff62d7e500aff72ceaa1b295f299f94a ChangeLog 7547
+RMD160 c589cad97410546b5c0388ad9cb6b717a026a7de ChangeLog 7547
+SHA256 d2b7e308d92466786fe81d68e9ac9172a5302a40893518c573bdfa85eec4bdef ChangeLog 7547
+MISC metadata.xml 339 RMD160 503ff4e79821bcf9851a8a6f8df0d43b3be8aa99 SHA1 7af6b38347db8330de0f27dbe2677156b524ebf9 SHA256 bb453c6b308cf1dfcbd818320ea43b654620a2b28dc24296c35367d803062635
 MD5 469a4f6cad0c54b4faed31a2852af816 metadata.xml 339
 RMD160 503ff4e79821bcf9851a8a6f8df0d43b3be8aa99 metadata.xml 339
 SHA256 bb453c6b308cf1dfcbd818320ea43b654620a2b28dc24296c35367d803062635 metadata.xml 339
-MD5 6cf2ecfcee6a47d187e99cc1fa3081f0 files/digest-heartbeat-1.2.3 68
-RMD160 967410361c3395b8a334380bd8f86655e4ea5394 files/digest-heartbeat-1.2.3 68
-SHA256 6db6cdac3b40c6a8f38871acd8d0cb5201ecd1bb1784ca627fb47d1c5dc32570 files/digest-heartbeat-1.2.3 68
-size 68 files/digest-heartbeat-1.2.3 68
-MD5 6cf2ecfcee6a47d187e99cc1fa3081f0 files/digest-heartbeat-1.2.3-r1 68
-RMD160 967410361c3395b8a334380bd8f86655e4ea5394 files/digest-heartbeat-1.2.3-r1 68
-SHA256 6db6cdac3b40c6a8f38871acd8d0cb5201ecd1bb1784ca627fb47d1c5dc32570 files/digest-heartbeat-1.2.3-r1 68
-size 68 files/digest-heartbeat-1.2.3-r1 68
-MD5 6cf2ecfcee6a47d187e99cc1fa3081f0 files/digest-heartbeat-1.2.3-r2 68
-RMD160 967410361c3395b8a334380bd8f86655e4ea5394 files/digest-heartbeat-1.2.3-r2 68
-SHA256 6db6cdac3b40c6a8f38871acd8d0cb5201ecd1bb1784ca627fb47d1c5dc32570 files/digest-heartbeat-1.2.3-r2 68
-size 68 files/digest-heartbeat-1.2.3-r2 68
-MD5 cae8a5342b1daa811a2421e405972387 files/digest-heartbeat-2.0.4 68
-RMD160 11624b2679b69202b8c649fc92b696cadb8f5983 files/digest-heartbeat-2.0.4 68
-SHA256 94851e3c0988981d02d6134499c781530d41abb4ae31d0bc9bac5bf198337794 files/digest-heartbeat-2.0.4 68
-size 68 files/digest-heartbeat-2.0.4 68
+MD5 415608c317af65c870b640a0395a3cf6 files/digest-heartbeat-1.2.3 250
+RMD160 84e81768fd2d08451886f4b940e30afe0f860780 files/digest-heartbeat-1.2.3 250
+SHA256 bc006ce9bc4b1ad0e959e8dc86f54c916ee6f0913ea60da82418e73e36c11302 files/digest-heartbeat-1.2.3 250
+MD5 415608c317af65c870b640a0395a3cf6 files/digest-heartbeat-1.2.3-r1 250
+RMD160 84e81768fd2d08451886f4b940e30afe0f860780 files/digest-heartbeat-1.2.3-r1 250
+SHA256 bc006ce9bc4b1ad0e959e8dc86f54c916ee6f0913ea60da82418e73e36c11302 files/digest-heartbeat-1.2.3-r1 250
+MD5 415608c317af65c870b640a0395a3cf6 files/digest-heartbeat-1.2.3-r2 250
+RMD160 84e81768fd2d08451886f4b940e30afe0f860780 files/digest-heartbeat-1.2.3-r2 250
+SHA256 bc006ce9bc4b1ad0e959e8dc86f54c916ee6f0913ea60da82418e73e36c11302 files/digest-heartbeat-1.2.3-r2 250
+MD5 312a98b3ebe9915c39b97f2a31822d5f files/digest-heartbeat-2.0.4 250
+RMD160 04652bd5f162d5b563e161b3158307c246634950 files/digest-heartbeat-2.0.4 250
+SHA256 c04540a9637f917fe1621888ccdb60682205fc5be2575cb4e9d9c2faa4492202 files/digest-heartbeat-2.0.4 250
+MD5 cde808732e5a6827e8f78cb3f80d1853 files/digest-heartbeat-2.0.5 250
+RMD160 60a8930056f7b0e77428ce75ec7f6a409a546dee files/digest-heartbeat-2.0.5 250
+SHA256 78549687fdd2003a265f6537958824589ccda63c1c7be3dd1bf8601bfb73f164 files/digest-heartbeat-2.0.5 250
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFEScTv2+ySkm8kpY0RAl+4AJ40KHSry8S5dZllAtNFCkk+nEOCSACgieSP
-Ng8Rhiuedx6//3NLPm6ikLo=
-=8wQF
+iD8DBQFEtlFxgMUyd/cdjWsRAtizAJsHVmBh1g0+dbnb/11bAJ2w9zbvIgCfau/9
+UMPUVmQ75yAiHZ4KXxvQZLs=
+=n2Ve
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/heartbeat/files/digest-heartbeat-1.2.3 b/sys-cluster/heartbeat/files/digest-heartbeat-1.2.3
index 1db4b5d1aa0a..85ac88aebbda 100644
--- a/sys-cluster/heartbeat/files/digest-heartbeat-1.2.3
+++ b/sys-cluster/heartbeat/files/digest-heartbeat-1.2.3
@@ -1 +1,3 @@
 MD5 9fd126e5dff51cc8c1eee223c252a4af heartbeat-1.2.3.tar.gz 1772513
+RMD160 f2d7b58e862c7bef3ee7d8a0421744fcd35544c2 heartbeat-1.2.3.tar.gz 1772513
+SHA256 44a2e7b3cea825f873d47366f02ff51a8aaab320d51618e959fa2c6a5cbf3ed2 heartbeat-1.2.3.tar.gz 1772513
diff --git a/sys-cluster/heartbeat/files/digest-heartbeat-1.2.3-r1 b/sys-cluster/heartbeat/files/digest-heartbeat-1.2.3-r1
index 1db4b5d1aa0a..85ac88aebbda 100644
--- a/sys-cluster/heartbeat/files/digest-heartbeat-1.2.3-r1
+++ b/sys-cluster/heartbeat/files/digest-heartbeat-1.2.3-r1
@@ -1 +1,3 @@
 MD5 9fd126e5dff51cc8c1eee223c252a4af heartbeat-1.2.3.tar.gz 1772513
+RMD160 f2d7b58e862c7bef3ee7d8a0421744fcd35544c2 heartbeat-1.2.3.tar.gz 1772513
+SHA256 44a2e7b3cea825f873d47366f02ff51a8aaab320d51618e959fa2c6a5cbf3ed2 heartbeat-1.2.3.tar.gz 1772513
diff --git a/sys-cluster/heartbeat/files/digest-heartbeat-1.2.3-r2 b/sys-cluster/heartbeat/files/digest-heartbeat-1.2.3-r2
index 1db4b5d1aa0a..85ac88aebbda 100644
--- a/sys-cluster/heartbeat/files/digest-heartbeat-1.2.3-r2
+++ b/sys-cluster/heartbeat/files/digest-heartbeat-1.2.3-r2
@@ -1 +1,3 @@
 MD5 9fd126e5dff51cc8c1eee223c252a4af heartbeat-1.2.3.tar.gz 1772513
+RMD160 f2d7b58e862c7bef3ee7d8a0421744fcd35544c2 heartbeat-1.2.3.tar.gz 1772513
+SHA256 44a2e7b3cea825f873d47366f02ff51a8aaab320d51618e959fa2c6a5cbf3ed2 heartbeat-1.2.3.tar.gz 1772513
diff --git a/sys-cluster/heartbeat/files/digest-heartbeat-2.0.4 b/sys-cluster/heartbeat/files/digest-heartbeat-2.0.4
index cc4914c94d4c..e8c91007a8bb 100644
--- a/sys-cluster/heartbeat/files/digest-heartbeat-2.0.4
+++ b/sys-cluster/heartbeat/files/digest-heartbeat-2.0.4
@@ -1 +1,3 @@
 MD5 659aae2365daea3a17e5a4a4ae0b0a3e heartbeat-2.0.4.tar.gz 2807110
+RMD160 94ff6d018253c29bee876bc5063ab1072b51091d heartbeat-2.0.4.tar.gz 2807110
+SHA256 334a3df02cdba3f1ef5f0ff60be54702928c54b40a5623cd55150b2a2d5d079f heartbeat-2.0.4.tar.gz 2807110
diff --git a/sys-cluster/heartbeat/files/digest-heartbeat-2.0.5 b/sys-cluster/heartbeat/files/digest-heartbeat-2.0.5
new file mode 100644
index 000000000000..b2eda3c2f3d9
--- /dev/null
+++ b/sys-cluster/heartbeat/files/digest-heartbeat-2.0.5
@@ -0,0 +1,3 @@
+MD5 209228b2948cfa4762a3a66454c6cc35 heartbeat-2.0.5.tar.gz 2837784
+RMD160 38591600953fe225ba9c548fd63b328f7e344da3 heartbeat-2.0.5.tar.gz 2837784
+SHA256 55565e61d991dd6b902b6b842321b6f33dd24ab4025cbd8bc72ae8b18e68e2b9 heartbeat-2.0.5.tar.gz 2837784
diff --git a/sys-cluster/heartbeat/files/heartbeat-init b/sys-cluster/heartbeat/files/heartbeat-init
index f3befad12794..a3ae6192bb29 100644
--- a/sys-cluster/heartbeat/files/heartbeat-init
+++ b/sys-cluster/heartbeat/files/heartbeat-init
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/files/heartbeat-init,v 1.5 2004/07/15 00:54:33 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/files/heartbeat-init,v 1.6 2006/07/13 12:52:23 xmerlin Exp $
 
 HA_DIR=/etc/ha.d
 
@@ -10,35 +10,79 @@ depend() {
 	need net
 }
 
+opts="start stop status reload restart"
+
+CheckBool() {
+	case `echo "$1" | tr A-Z a-z` in
+		y|yes|enable|on|true|1)     true;;
+		*)                          false;;
+	esac
+}
+
 # Run pre-startup script if it exists
 RunStartStop() {
 	[ -f $HA_DIR/resource.d/startstop ] && $HA_DIR/resource.d/startstop  "$@"
 }
 
 start() {
-	ebegin "Starting Heartbeat"
+	ebegin "Starting heartbeat"
+
+	. $HA_DIR/shellfuncs
+
+	# start the log subsystem
+	/usr/lib/heartbeat/ha_logd -s &>/dev/null && \
+		/usr/lib/heartbeat/ha_logd -d
 
 	RunStartStop pre-start
 
-	/usr/lib/heartbeat/heartbeat 2>&1
+	CheckBool "`ha_parameter crm`" && \
+		/usr/lib/heartbeat/ResourceManager verifyallidle
+
+	/usr/lib/heartbeat/heartbeat &>/dev/null
 	ret=$?
-	/usr/lib/heartbeat/ResourceManager verifyallidle
 
 	RunStartStop post-start
 
-	eend $ret
+	eend ${ret}
 }
 
 stop() {
-	ebegin "Stopping Heartbeat"
-	/usr/lib/heartbeat/heartbeat -k &> /dev/null
-	eend $?
-}
+	ebegin "Stopping heartbeat"
 
-restart() {
-	/usr/lib/heartbeat/heartbeat -r
+	RunStartStop pre-stop
+
+	/usr/lib/heartbeat/heartbeat -k &>/dev/null
+	ret=$?
+
+	RunStartStop post-stop ${ret}
+
+	# stop log subsystem
+	/usr/lib/heartbeat/ha_logd -s &>/dev/null || \
+		/usr/lib/heartbeat/ha_logd -k &>/dev/null
+
+	eend ${ret}
 }
 
 status() {
 	/usr/lib/heartbeat/heartbeat -s
 }
+
+reload() {
+	ebegin "Reloading heartbeat"
+	/usr/lib/heartbeat/heartbeat -r &>/dev/null
+	eend $?
+}
+
+restart() {
+	. $HA_DIR/shellfuncs
+
+	sleeptime=$(( `ha_parameter deadtime` + 10 ))
+
+	svc_stop
+
+	ebegin "  waiting ${sleeptime}s to allow resource takeover to complete"
+	sleep ${sleeptime}
+	eend 0
+
+	svc_start
+}
diff --git a/sys-cluster/heartbeat/heartbeat-2.0.5.ebuild b/sys-cluster/heartbeat/heartbeat-2.0.5.ebuild
new file mode 100644
index 000000000000..977c4258b6d4
--- /dev/null
+++ b/sys-cluster/heartbeat/heartbeat-2.0.5.ebuild
@@ -0,0 +1,111 @@
+# 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.5.ebuild,v 1.1 2006/07/13 12:52:23 xmerlin Exp $
+
+inherit flag-o-matic
+
+DESCRIPTION="Heartbeat high availability cluster manager"
+HOMEPAGE="http://www.linux-ha.org"
+SRC_URI="http://www.linux-ha.org/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-amd64 -mips -ppc -s390 ~x86"
+IUSE="ldirectord doc snmp management"
+
+DEPEND="
+	=dev-libs/glib-2*
+	net-libs/libnet
+	dev-util/pkgconfig
+	dev-lang/perl
+	net-misc/iputils
+	virtual/ssh
+	net-libs/gnutls
+	ldirectord? (	sys-cluster/ipvsadm
+			dev-perl/Net-DNS
+			dev-perl/libwww-perl
+			dev-perl/perl-ldap
+			perl-core/libnet
+			dev-perl/Crypt-SSLeay
+			dev-perl/HTML-Parser
+			dev-perl/perl-ldap
+			dev-perl/Mail-IMAPClient
+	)
+	snmp? ( net-analyzer/net-snmp )
+	net-misc/telnet-bsd
+	dev-lang/swig
+	management? (
+		>=dev-lang/python-2.4
+		>=dev-python/pygtk-2.4
+		>=sys-libs/pam-0.78-r3
+	)
+	"
+
+
+src_compile() {
+	append-ldflags $(bindnow-flags)
+
+	./configure --prefix=/usr \
+		--mandir=/usr/share/man \
+		--sysconfdir=/etc \
+		--localstatedir=/var \
+		--with-group-name=cluster \
+		--with-group-id=65 \
+		--with-ccmuser-name=cluster \
+		--with-ccmuser-id=65 \
+		--enable-checkpointd \
+		--enable-crm \
+		--enable-lrm \
+		$(use_enable management mgmt) \
+		|| die
+	emake -j 1 || die "compile problem"
+}
+
+pkg_preinst() {
+	# check for cluster group, if it doesn't exist make it
+	if ! grep -q cluster.*65 /etc/group ; then
+		groupadd -g 65 cluster
+	fi
+	# check for cluster user, if it doesn't exist make it
+	if ! grep -q cluster.*65 /etc/passwd ; then
+		useradd -u 65 -g cluster -s /dev/null -d /var/lib/heartbeat cluster
+	fi
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+
+	# heartbeat modules need these dirs
+	#keepdir /var/lib/heartbeat/ckpt /var/lib/heartbeat/ccm /var/lib/heartbeat
+
+	keepdir /var/lib/heartbeat/crm /var/lib/heartbeat/lrm /var/lib/heartbeat/fencing
+	keepdir /var/lib/heartbeat/cores/cluster /var/lib/heartbeat/cores/root /var/lib/heartbeat/cores/nobody
+
+	keepdir /var/run/heartbeat/ccm /var/run/heartbeat/crm
+
+	keepdir /etc/ha.d/conf
+
+	dosym /usr/sbin/ldirectord /etc/ha.d/resource.d/ldirectord || die
+
+	if use management ; then
+		keepdir /var/lib/heartbeat/mgmt
+	fi
+
+	# if ! USE="ldirectord" then don't install it
+	if ! use ldirectord ; then
+		rm ${D}/etc/init.d/ldirectord
+		rm ${D}/etc/logrotate.d/ldirectord
+		rm ${D}/usr/share/man/man8/supervise-ldirectord-config.8
+		rm ${D}/usr/share/man/man8/ldirectord.8
+		rm ${D}/usr/sbin/ldirectord
+		rm ${D}/usr/sbin/supervise-ldirectord-config
+	fi
+
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/heartbeat-init heartbeat
+
+	dodoc ldirectord/ldirectord.cf doc/*.cf doc/haresources doc/authkeys || die
+	if use doc ; then
+		dodoc README doc/*.txt doc/AUTHORS doc/COPYING  || die
+	fi
+}