added a local use flag for ldirectord since it has some pretty hefty deps

3 files changed, 46 insertions, 5 deletions

diff --git a/sys-cluster/heartbeat/ChangeLog b/sys-cluster/heartbeat/ChangeLog
index 857b24b1068b..789004c20fe5 100644
--- a/sys-cluster/heartbeat/ChangeLog
+++ b/sys-cluster/heartbeat/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-cluster/heartbeat
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/ChangeLog,v 1.12 2003/11/21 17:57:37 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/ChangeLog,v 1.13 2003/12/15 09:55:30 iggy Exp $
+
+  15 Dec 2003; Brian Jackson <iggy@gentoo.org> heartbeat-1.0.4.ebuild,
+  heartbeat-1.1.3.ebuild:
+  added a local use flag for ldirectord since it has some pretty hefty deps
+  fixes bug #34617, thanks to alekiv@hot.ee for the report
 
   21 Nov 2003; Brian Jackson <iggy@gentoo.org> heartbeat-1.1.3.ebuild:
   ltmain.sh doesn't like the new POSIX semantics, adding an export POSIX_VER to
diff --git a/sys-cluster/heartbeat/heartbeat-1.0.4.ebuild b/sys-cluster/heartbeat/heartbeat-1.0.4.ebuild
index a473cd605565..64348878d11b 100644
--- a/sys-cluster/heartbeat/heartbeat-1.0.4.ebuild
+++ b/sys-cluster/heartbeat/heartbeat-1.0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/heartbeat-1.0.4.ebuild,v 1.2 2003/10/16 02:14:15 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/heartbeat-1.0.4.ebuild,v 1.3 2003/12/15 09:55:30 iggy Exp $
 
 DESCRIPTION="Heartbeat high availability cluster manager"
 HOMEPAGE="http://www.linux-ha.org"
@@ -9,10 +9,17 @@ SRC_URI="http://www.linux-ha.org/download/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86"
+IUSE="ldirectord"
 
 DEPEND="dev-libs/popt
 	dev-libs/glib
-	net-libs/libnet"
+	net-libs/libnet
+	ldirectord? (	sys-cluster/ipvsadm
+			dev-perl/libwww-perl
+			dev-perl/perl-ldap
+			dev-perl/libnet )"
+
+# need to add dev-perl/Mail-IMAPClient inside ldirectord above
 
 src_compile() {
 	./configure --prefix=/usr \
@@ -38,6 +45,17 @@ pkg_preinst() {
 
 src_install() {
 	make DESTDIR=${D} install || 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
 }
diff --git a/sys-cluster/heartbeat/heartbeat-1.1.3.ebuild b/sys-cluster/heartbeat/heartbeat-1.1.3.ebuild
index 8458a4d63aaf..c79e932ff466 100644
--- a/sys-cluster/heartbeat/heartbeat-1.1.3.ebuild
+++ b/sys-cluster/heartbeat/heartbeat-1.1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/heartbeat-1.1.3.ebuild,v 1.3 2003/11/21 17:55:51 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/heartbeat-1.1.3.ebuild,v 1.4 2003/12/15 09:55:30 iggy Exp $
 
 DESCRIPTION="Heartbeat high availability cluster manager"
 HOMEPAGE="http://www.linux-ha.org"
@@ -9,10 +9,17 @@ SRC_URI="http://www.linux-ha.org/download/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 mips"
+IUSE="ldirectord"
 
 DEPEND="dev-libs/popt
 	dev-libs/glib
-	net-libs/libnet"
+	net-libs/libnet
+	ldirectord? (	sys-cluster/ipvsadm
+			dev-perl/libwww-perl
+			dev-perl/perl-ldap
+			dev-perl/libnet )"
+
+# need to add dev-perl/Mail-IMAPClient inside ldirectord above
 
 src_unpack() {
 	unpack ${A}
@@ -46,6 +53,17 @@ pkg_preinst() {
 
 src_install() {
 	make DESTDIR=${D} install || 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
 }