Add slapd to use in init.d depends when built with USE=ldap #442560 by Tiziano Müller.

(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key FB7C4156)

4 files changed, 14 insertions, 7 deletions

diff --git a/net-misc/dhcp/ChangeLog b/net-misc/dhcp/ChangeLog
index a53a4104e3a0..5363c247ef23 100644
--- a/net-misc/dhcp/ChangeLog
+++ b/net-misc/dhcp/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/dhcp
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/ChangeLog,v 1.227 2012/11/11 20:42:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/ChangeLog,v 1.228 2012/11/11 21:42:02 vapier Exp $
+
+  11 Nov 2012; Mike Frysinger <vapier@gentoo.org> dhcp-4.2.4_p2-r1.ebuild,
+  files/dhcpd.init5, files/dhcrelay.init3:
+  Add slapd to use in init.d depends when built with USE=ldap #442560 by Tiziano
+  Müller.
 
   11 Nov 2012; Mike Frysinger <vapier@gentoo.org> dhcp-4.2.4_p2-r1.ebuild:
   Drop NetworkManager dbus patch as NM handles this itself now #441968 by Pavel
diff --git a/net-misc/dhcp/dhcp-4.2.4_p2-r1.ebuild b/net-misc/dhcp/dhcp-4.2.4_p2-r1.ebuild
index 8c861f8a052b..f508bb1308f0 100644
--- a/net-misc/dhcp/dhcp-4.2.4_p2-r1.ebuild
+++ b/net-misc/dhcp/dhcp-4.2.4_p2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-4.2.4_p2-r1.ebuild,v 1.3 2012/11/11 20:42:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-4.2.4_p2-r1.ebuild,v 1.4 2012/11/11 21:42:02 vapier Exp $
 
 EAPI="4"
 
@@ -199,6 +199,8 @@ src_install() {
 		newconfd "${FILESDIR}"/dhcrelay.conf dhcrelay
 		newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay6
 		newconfd "${FILESDIR}"/dhcrelay6.conf dhcrelay6
+
+		sed -i "s:#@slapd@:$(usex ldap slapd ''):" "${ED}"/etc/init.d/* || die #442560
 	fi
 
 	# the default config files aren't terribly useful #384087
diff --git a/net-misc/dhcp/files/dhcpd.init5 b/net-misc/dhcp/files/dhcpd.init5
index c3bbab78082d..14c0b6af29f7 100755
--- a/net-misc/dhcp/files/dhcpd.init5
+++ b/net-misc/dhcp/files/dhcpd.init5
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/files/dhcpd.init5,v 1.1 2011/12/04 22:45:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/files/dhcpd.init5,v 1.2 2012/11/11 21:42:02 vapier Exp $
 
 extra_commands="configtest"
 
@@ -9,7 +9,7 @@ extra_commands="configtest"
 
 depend() {
 	need net
-	use logger dns
+	use logger dns #@slapd@
 }
 
 get_var() {
diff --git a/net-misc/dhcp/files/dhcrelay.init3 b/net-misc/dhcp/files/dhcrelay.init3
index 89e752541e9c..fe4ec8c6d697 100755
--- a/net-misc/dhcp/files/dhcrelay.init3
+++ b/net-misc/dhcp/files/dhcrelay.init3
@@ -1,11 +1,11 @@
 #!/sbin/runscript
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/files/dhcrelay.init3,v 1.2 2012/05/16 15:57:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/files/dhcrelay.init3,v 1.3 2012/11/11 21:42:02 vapier Exp $
 
 depend() {
 	need net
-	use logger
+	use logger #@slapd@
 }
 
 start() {