removed pils and stonith use flags, fixed bug #115662.

(Portage version: 2.0.51.22-r3)

3 files changed, 13 insertions, 35 deletions

diff --git a/sys-cluster/heartbeat/ChangeLog b/sys-cluster/heartbeat/ChangeLog
index 2a39fd7a7d3b..870d57135eef 100644
--- a/sys-cluster/heartbeat/ChangeLog
+++ b/sys-cluster/heartbeat/ChangeLog
@@ -1,6 +1,9 @@
 # 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.37 2005/11/13 18:22:49 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/ChangeLog,v 1.38 2005/12/17 18:40:47 xmerlin Exp $
+
+  17 Dec 2005; Christian Zoffoli <xmerlin@gentoo.org> heartbeat-2.0.2.ebuild:
+  removed pils and stonith use flags, fixed bug #115662.
 
 *heartbeat-2.0.2 (13 Nov 2005)
 
diff --git a/sys-cluster/heartbeat/Manifest b/sys-cluster/heartbeat/Manifest
index 4ee33d716ab6..139aa6f83f68 100644
--- a/sys-cluster/heartbeat/Manifest
+++ b/sys-cluster/heartbeat/Manifest
@@ -1,12 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 0dfed48cff866eed74dafdd56e861cd5 ChangeLog 6100
 MD5 469a4f6cad0c54b4faed31a2852af816 metadata.xml 339
 MD5 43e3cb324e0096306884c5c68f7ea4ce heartbeat-1.2.3-r1.ebuild 2094
 MD5 72cd506bc581948c4a68e28017430c64 heartbeat-1.2.3.ebuild 1875
 MD5 6e0ce7550962b424bbdb16edff62a295 heartbeat-1.2.3-r2.ebuild 2148
-MD5 51233b2203378fcb7c79f0133d807644 heartbeat-2.0.2.ebuild 2941
+MD5 cc7f99d52e3acd6234f12f0c826f2f8d heartbeat-2.0.2.ebuild 2656
 MD5 6cf2ecfcee6a47d187e99cc1fa3081f0 files/digest-heartbeat-1.2.3 68
 MD5 343f80e3711eec80114c5ca01d38b8b0 files/heartbeat-init 821
 MD5 6cf2ecfcee6a47d187e99cc1fa3081f0 files/digest-heartbeat-1.2.3-r1 68
@@ -14,10 +11,3 @@ MD5 4382b0b2d64b5483957114b7123e4a94 files/heartbeat-1.2.3-lvm.patch 1660
 MD5 30657e79d1e3630eed837297364fe17c files/heartbeat-1.2.3-misc_security_fixes.patch 7756
 MD5 6cf2ecfcee6a47d187e99cc1fa3081f0 files/digest-heartbeat-1.2.3-r2 68
 MD5 aaf8fa43df7ae5328ab7cce82d6a7547 files/digest-heartbeat-2.0.2 68
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDd4TKgMUyd/cdjWsRAtxcAJ9n3VXt9zDBUXAsoUpXuvl9aZ3fJACfQmh3
-2RJhls/DcnX1NoqHb3zcHG0=
-=sjED
------END PGP SIGNATURE-----
diff --git a/sys-cluster/heartbeat/heartbeat-2.0.2.ebuild b/sys-cluster/heartbeat/heartbeat-2.0.2.ebuild
index f8c3e84730e1..b3a5e09d3d52 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
 # 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.1 2005/11/13 18:22:49 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/heartbeat-2.0.2.ebuild,v 1.2 2005/12/17 18:40:47 xmerlin Exp $
 
 inherit flag-o-matic
 
@@ -11,10 +11,7 @@ SRC_URI="http://www.linux-ha.org/download/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 -mips -ppc -amd64"
-IUSE="ldirectord stonith pils doc"
-
-
-#dev-libs/popt
+IUSE="ldirectord doc"
 
 DEPEND="
 	=dev-libs/glib-2*
@@ -33,9 +30,7 @@ DEPEND="
 			dev-perl/perl-ldap
 			dev-perl/Mail-IMAPClient
 	)
-	stonith? (
-			net-misc/telnet-bsd
-	)
+	net-misc/telnet-bsd
 "
 
 
@@ -54,7 +49,11 @@ src_compile() {
 		--with-group-name=cluster \
 		--with-group-id=65 \
 		--with-ccmuser-name=cluster \
-		--with-ccmuser-id=65 || die
+		--with-ccmuser-id=65 \
+		--enable-checkpointd \
+		--enable-crm \
+		--enable-lrm \
+		|| die
 	emake -j 1 || die "compile problem"
 }
 
@@ -94,20 +93,6 @@ src_install() {
 		rm ${D}/usr/sbin/supervise-ldirectord-config
 	fi
 
-	if ! use stonith ; then
-		rm ${D}/usr/include/stonith
-		rm -r ${D}/usr/lib/*stonith*
-		rm ${D}/usr/sbin/stonith
-		rm ${D}/usr/sbin/meatclient
-		rm ${D}/usr/man/man8/stonith.8*
-		rm ${D}/usr/man/man8/meatclient.8*
-	fi
-
-	if ! use pils ; then
-		rm ${D}/usr/include/pils
-		rm -r ${D}/usr/lib/*pils*
-	fi
-
 	exeinto /etc/init.d
 	newexe ${FILESDIR}/heartbeat-init heartbeat