ebuilds cleanup, added snmp use flag to 2.0.2.

(Portage version: 2.0.51.22-r3)

8 files changed, 122 insertions, 25 deletions

diff --git a/sys-cluster/heartbeat/ChangeLog b/sys-cluster/heartbeat/ChangeLog
index 04141060c066..f54d2282eff9 100644
--- a/sys-cluster/heartbeat/ChangeLog
+++ b/sys-cluster/heartbeat/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-cluster/heartbeat
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/ChangeLog,v 1.40 2005/12/30 12:05:50 mcummings Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/ChangeLog,v 1.41 2006/02/12 16:04:31 xmerlin Exp $
+
+*heartbeat-2.0.2-r1 (12 Feb 2006)
+
+  12 Feb 2006; Christian Zoffoli <xmerlin@gentoo.org>
+  +heartbeat-2.0.2-r1.ebuild:
+  ebuilds cleanup, added snmp use flag to 2.0.2.
 
   30 Dec 2005; <mcumming@gentoo.org> heartbeat-1.2.3-r1.ebuild,
   heartbeat-1.2.3-r2.ebuild, heartbeat-1.2.3.ebuild, heartbeat-2.0.2.ebuild:
diff --git a/sys-cluster/heartbeat/Manifest b/sys-cluster/heartbeat/Manifest
index d9e678695b0a..a510519d4e37 100644
--- a/sys-cluster/heartbeat/Manifest
+++ b/sys-cluster/heartbeat/Manifest
@@ -1,7 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 50744ec1a80e566d91d9364bf44e2300 ChangeLog 6542
+MD5 92838afa898270ab6ecc45ed65258774 heartbeat-1.2.3-r1.ebuild 2097
+MD5 b2cf42d7a874c448a695cc71139b57a9 heartbeat-1.2.3-r2.ebuild 2151
+MD5 267805182c9eb3fc756871f07756858b heartbeat-1.2.3.ebuild 1876
+MD5 f2af5c1f3b7ae84870368a419c99766d heartbeat-2.0.2.ebuild 2665
+MD5 469a4f6cad0c54b4faed31a2852af816 metadata.xml 339
+MD5 7f416c7e4ce31d4ad8a96ae53d1ac201 heartbeat-2.0.2-r1.ebuild 2594
 MD5 6cf2ecfcee6a47d187e99cc1fa3081f0 files/digest-heartbeat-1.2.3 68
 MD5 6cf2ecfcee6a47d187e99cc1fa3081f0 files/digest-heartbeat-1.2.3-r1 68
 MD5 6cf2ecfcee6a47d187e99cc1fa3081f0 files/digest-heartbeat-1.2.3-r2 68
@@ -9,15 +12,4 @@ MD5 aaf8fa43df7ae5328ab7cce82d6a7547 files/digest-heartbeat-2.0.2 68
 MD5 4382b0b2d64b5483957114b7123e4a94 files/heartbeat-1.2.3-lvm.patch 1660
 MD5 30657e79d1e3630eed837297364fe17c files/heartbeat-1.2.3-misc_security_fixes.patch 7756
 MD5 343f80e3711eec80114c5ca01d38b8b0 files/heartbeat-init 821
-MD5 272a4b2de2cf7a52000727661c736a89 heartbeat-1.2.3-r1.ebuild 2097
-MD5 76dacaf8146a8305bf041ae9f67748f1 heartbeat-1.2.3-r2.ebuild 2151
-MD5 b6296f97d4407d37eeda9a668cb4d937 heartbeat-1.2.3.ebuild 1876
-MD5 830a5a2453b90ea68e25210e43bcad16 heartbeat-2.0.2.ebuild 2665
-MD5 469a4f6cad0c54b4faed31a2852af816 metadata.xml 339
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDtSKntG5z4I8BtQoRAnd7AJ4gFyY4zbmXcLkNdjUSEGVMTtl1CwCfR2X3
-Rab04rVR3RNFBvvvgnSOWMs=
-=4V+c
------END PGP SIGNATURE-----
+MD5 aaf8fa43df7ae5328ab7cce82d6a7547 files/digest-heartbeat-2.0.2-r1 68
diff --git a/sys-cluster/heartbeat/files/digest-heartbeat-2.0.2-r1 b/sys-cluster/heartbeat/files/digest-heartbeat-2.0.2-r1
new file mode 100644
index 000000000000..6e794ff34b1b
--- /dev/null
+++ b/sys-cluster/heartbeat/files/digest-heartbeat-2.0.2-r1
@@ -0,0 +1 @@
+MD5 097de2cc6d15f8f87ea39ab521f616d5 heartbeat-2.0.2.tar.gz 2189961
diff --git a/sys-cluster/heartbeat/heartbeat-1.2.3-r1.ebuild b/sys-cluster/heartbeat/heartbeat-1.2.3-r1.ebuild
index 40102f94baee..cf4cbfc6b8cf 100644
--- a/sys-cluster/heartbeat/heartbeat-1.2.3-r1.ebuild
+++ b/sys-cluster/heartbeat/heartbeat-1.2.3-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 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/heartbeat-1.2.3-r1.ebuild,v 1.4 2005/12/30 12:05:50 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/heartbeat-1.2.3-r1.ebuild,v 1.5 2006/02/12 16:04:31 xmerlin Exp $
 
 inherit flag-o-matic
 
diff --git a/sys-cluster/heartbeat/heartbeat-1.2.3-r2.ebuild b/sys-cluster/heartbeat/heartbeat-1.2.3-r2.ebuild
index 18688a7d924d..0f3e8433abed 100644
--- a/sys-cluster/heartbeat/heartbeat-1.2.3-r2.ebuild
+++ b/sys-cluster/heartbeat/heartbeat-1.2.3-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 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/heartbeat-1.2.3-r2.ebuild,v 1.3 2005/12/30 12:05:50 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/heartbeat-1.2.3-r2.ebuild,v 1.4 2006/02/12 16:04:31 xmerlin Exp $
 
 inherit flag-o-matic
 
diff --git a/sys-cluster/heartbeat/heartbeat-1.2.3.ebuild b/sys-cluster/heartbeat/heartbeat-1.2.3.ebuild
index 0ffa1c54fd22..c64a8d204f0f 100644
--- a/sys-cluster/heartbeat/heartbeat-1.2.3.ebuild
+++ b/sys-cluster/heartbeat/heartbeat-1.2.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 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/heartbeat-1.2.3.ebuild,v 1.8 2005/12/30 12:05:50 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/heartbeat-1.2.3.ebuild,v 1.9 2006/02/12 16:04:31 xmerlin Exp $
 
 inherit flag-o-matic
 
diff --git a/sys-cluster/heartbeat/heartbeat-2.0.2-r1.ebuild b/sys-cluster/heartbeat/heartbeat-2.0.2-r1.ebuild
new file mode 100644
index 000000000000..2b9514a56d8c
--- /dev/null
+++ b/sys-cluster/heartbeat/heartbeat-2.0.2-r1.ebuild
@@ -0,0 +1,98 @@
+# 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.2-r1.ebuild,v 1.1 2006/02/12 16:04:31 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="~x86 -mips -ppc -amd64"
+IUSE="ldirectord doc snmp"
+
+DEPEND="
+	=dev-libs/glib-2*
+	net-libs/libnet
+	dev-util/pkgconfig
+	dev-lang/perl
+	net-misc/iputils
+	net-misc/openssh
+	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
+	"
+
+
+src_compile() {
+	append-ldflags $(bindnow-flags)
+
+	./configure --prefix=/usr \
+		--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 \
+		|| 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="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/man/man8/supervise-ldirectord-config.8
+		rm ${D}/usr/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
+}
diff --git a/sys-cluster/heartbeat/heartbeat-2.0.2.ebuild b/sys-cluster/heartbeat/heartbeat-2.0.2.ebuild
index 05fa6a07c781..55c2a16f6578 100644
--- a/sys-cluster/heartbeat/heartbeat-2.0.2.ebuild
+++ b/sys-cluster/heartbeat/heartbeat-2.0.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 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/heartbeat-2.0.2.ebuild,v 1.4 2005/12/30 12:05:50 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/heartbeat-2.0.2.ebuild,v 1.5 2006/02/12 16:04:31 xmerlin Exp $
 
 inherit flag-o-matic