Added some missing deps. Fixed bug #144931.

(Portage version: 2.1-r1)
 (Signed Manifest commit)

3 files changed, 14 insertions, 133 deletions

diff --git a/sys-cluster/heartbeat/Manifest b/sys-cluster/heartbeat/Manifest
index 707706881fd4..ac94e33297d6 100644
--- a/sys-cluster/heartbeat/Manifest
+++ b/sys-cluster/heartbeat/Manifest
@@ -28,14 +28,14 @@ EBUILD heartbeat-1.2.5.ebuild 1986 RMD160 b25871073d61edada88a167eaf37a4de2b552d
 MD5 f58c89bbad4b79cf45813b8425371891 heartbeat-1.2.5.ebuild 1986
 RMD160 b25871073d61edada88a167eaf37a4de2b552d6a heartbeat-1.2.5.ebuild 1986
 SHA256 66e711596a2b2dad696930abe7ccde73340e6742a09499a65795236fa1e425c0 heartbeat-1.2.5.ebuild 1986
-EBUILD heartbeat-2.0.7.ebuild 2979 RMD160 d9cb13983a018ca6a8361deb9a4dbfe04c29d138 SHA1 f5a44a1b73a01008e4e2dcab1ad6da4ad138faa3 SHA256 e08b759477e9f7fd9ef746cd48f13d80aec2e18a3afd5046b1181faca6553384
-MD5 5d30067a355a969fa8e5fbd8758b0d40 heartbeat-2.0.7.ebuild 2979
-RMD160 d9cb13983a018ca6a8361deb9a4dbfe04c29d138 heartbeat-2.0.7.ebuild 2979
-SHA256 e08b759477e9f7fd9ef746cd48f13d80aec2e18a3afd5046b1181faca6553384 heartbeat-2.0.7.ebuild 2979
-MISC ChangeLog 9027 RMD160 bb25532d8bcdd88e2ca5f288b19a64bd98bec98c SHA1 885f0029ae45565a7b11e1ed5d851246f7d5bbde SHA256 781e43705fb0aa80eaef653e85ed3aa016a448b21b9dc433e44fb00d7bc50fcb
-MD5 c2461322f67e67db96ea213939417060 ChangeLog 9027
-RMD160 bb25532d8bcdd88e2ca5f288b19a64bd98bec98c ChangeLog 9027
-SHA256 781e43705fb0aa80eaef653e85ed3aa016a448b21b9dc433e44fb00d7bc50fcb ChangeLog 9027
+EBUILD heartbeat-2.0.7-r1.ebuild 3081 RMD160 f37fb7fe0ec3f3756d5c1b91c8d4a8f53659c510 SHA1 46aa5cb0c99d152c2948402c28231a5fb4ac8880 SHA256 20c61c7ab58e280bccb43b38ae431c3f46fcec85ca979cfe5a9c83d5f61b7d28
+MD5 2b6beb88a677967937913d0f90eb9e74 heartbeat-2.0.7-r1.ebuild 3081
+RMD160 f37fb7fe0ec3f3756d5c1b91c8d4a8f53659c510 heartbeat-2.0.7-r1.ebuild 3081
+SHA256 20c61c7ab58e280bccb43b38ae431c3f46fcec85ca979cfe5a9c83d5f61b7d28 heartbeat-2.0.7-r1.ebuild 3081
+MISC ChangeLog 9218 RMD160 cf2fc85ef7bb947b89605b57a176a987725acccb SHA1 d560c6af1ebf7670cde1c2b3e12db0130d23a87f SHA256 c4ff08d6c404376b88ab0f2f389aef1eba7322f7e4f082ff89bcda33cabcd6ee
+MD5 c40b887354a589f7f64fb7da2ea9e9ac ChangeLog 9218
+RMD160 cf2fc85ef7bb947b89605b57a176a987725acccb ChangeLog 9218
+SHA256 c4ff08d6c404376b88ab0f2f389aef1eba7322f7e4f082ff89bcda33cabcd6ee ChangeLog 9218
 MISC metadata.xml 339 RMD160 503ff4e79821bcf9851a8a6f8df0d43b3be8aa99 SHA1 7af6b38347db8330de0f27dbe2677156b524ebf9 SHA256 bb453c6b308cf1dfcbd818320ea43b654620a2b28dc24296c35367d803062635
 MD5 469a4f6cad0c54b4faed31a2852af816 metadata.xml 339
 RMD160 503ff4e79821bcf9851a8a6f8df0d43b3be8aa99 metadata.xml 339
@@ -49,13 +49,13 @@ SHA256 bc006ce9bc4b1ad0e959e8dc86f54c916ee6f0913ea60da82418e73e36c11302 files/di
 MD5 daf9681c106348445798e3a5ef2c244e files/digest-heartbeat-1.2.5 250
 RMD160 f4e5e39e26ea317e2573ad5b4060a7ea86db34c1 files/digest-heartbeat-1.2.5 250
 SHA256 931bb676e4aaa9426fadcc6cea6f67a3ea9f0d9d2737abb80e89eceb9bacca04 files/digest-heartbeat-1.2.5 250
-MD5 730e170420e55cc6abbb746fb0f0ae14 files/digest-heartbeat-2.0.7 250
-RMD160 c33c56e13bd882781b92ac96f8a8d4fff191208e files/digest-heartbeat-2.0.7 250
-SHA256 4e28f3c92fda41c864ef7aaa4d6b540a751f22135d21ae4be00a89cf5c57425d files/digest-heartbeat-2.0.7 250
+MD5 730e170420e55cc6abbb746fb0f0ae14 files/digest-heartbeat-2.0.7-r1 250
+RMD160 c33c56e13bd882781b92ac96f8a8d4fff191208e files/digest-heartbeat-2.0.7-r1 250
+SHA256 4e28f3c92fda41c864ef7aaa4d6b540a751f22135d21ae4be00a89cf5c57425d files/digest-heartbeat-2.0.7-r1 250
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFE5afXgMUyd/cdjWsRAhfVAJ91U7uZnWpl8ofoQgzsuWYAmkwO1ACePcbv
-dMoghZAAFRs44CqUhnkmO6E=
-=zt5g
+iD8DBQFE7eI4gMUyd/cdjWsRAq03AJ9nhq3YD4yWM+aYrCMAnqU+HlG2DQCgjqCp
+SPJp3COCBm8tSjcr4Z2WncY=
+=zjJx
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/heartbeat/files/digest-heartbeat-2.0.7 b/sys-cluster/heartbeat/files/digest-heartbeat-2.0.7
deleted file mode 100644
index 8ff7ae56cec2..000000000000
--- a/sys-cluster/heartbeat/files/digest-heartbeat-2.0.7
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 41233e5097c42341bf2162806d4cb99c heartbeat-2.0.7.tar.gz 3327126
-RMD160 8fe70e64fc6714fef4e501ae0b240d870a51cf75 heartbeat-2.0.7.tar.gz 3327126
-SHA256 008214f51fd0c49e168d1bb262cb5c967bc166f99d0c8ff3a2623c8ba51a0ab3 heartbeat-2.0.7.tar.gz 3327126
diff --git a/sys-cluster/heartbeat/heartbeat-2.0.7.ebuild b/sys-cluster/heartbeat/heartbeat-2.0.7.ebuild
deleted file mode 100644
index 3a6280a8ddef..000000000000
--- a/sys-cluster/heartbeat/heartbeat-2.0.7.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# 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.7.ebuild,v 1.2 2006/08/18 10:37:58 xmerlin Exp $
-
-inherit flag-o-matic eutils
-
-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_unpack() {
-	unpack ${A}
-	cd ${S}
-	#epatch ${FILESDIR}/${PN}-2.0.4-fix-local-DOS-attack.patch || die
-}
-
-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
-}