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

Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64
Manifest-Sign-Key: 0xFB7C4156

5 files changed, 31 insertions, 24 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/Manifest b/net-misc/dhcp/Manifest
index 04946ab95e49..07dd45cb2caf 100644
--- a/net-misc/dhcp/Manifest
+++ b/net-misc/dhcp/Manifest
@@ -36,11 +36,11 @@ AUX dhcpd.conf2 1068 SHA256 e8a413e9102948b336f60041fc3cade33125faf56d8319ee65d9
 AUX dhcpd.init2 2421 SHA256 fef93e5a7264780044a977ade27e9cc70de824063791bcd07d3db81c11c16df5 SHA512 ab7f9c310ad7d6342aa996ae4a94f71e7df71ecaea569cec721637f75ba1a26681769181ef6f2eef1b11cb6bbf5827ab7503ba6012a689d82ac1b96eb918c444 WHIRLPOOL bfc0a4e31521c8b527c5c47ee449d2f2c9e84c4316fa869ba019fb31c9cc9db884d65d016a537c53874556fdc95165039705943dae32b30a8853900685cbfc2e
 AUX dhcpd.init3 2525 SHA256 69f5e6bee391a9a03554bead07c9dd5775e1fbb2a0ae515b7930cec328a8959c SHA512 457ba7e00bf28245e1c5a9cd9ca1ac98d623c12a646d15a97ee30b4d74ecbb723d39d65361952094b3ff2d98db53645ab9ecd4ff96243aab3838287beed93059 WHIRLPOOL c9bba43196c29cb992412499c2574c114b704fe81b55b8c4a7e424df22ae78290945b21056889c56c91d7f9c73f1ae698ec013637e0a306ca4244acc3c7e6109
 AUX dhcpd.init4 2902 SHA256 6d746cf628d4dd4a191cefc4869bbe12b0fb9eb69b69c062ad4d3e3b369e9044 SHA512 3c4c5a7fecddbb8ab5891d470958dcf85a5b32fad8c0fbb3144654d9f6b45461a8e3a1d7cb7a03cc5e1eab4ed351ca9f4f6eb306b533b68fe84497b2016f68fa WHIRLPOOL 52efd0ef428a22fb7dab78ca9b40247163f4d0de9061b9b807342c12130a4f3af80770a6a97036d9fdd883cf48b9617c37a134e2592e7e807a42e3622f1365b9
-AUX dhcpd.init5 2874 SHA256 d724ed829c8d13595f1609644308656141c8057ab06fad6cf6afe80caf0f6229 SHA512 cb6131134a8bc1e341aed5da571bb642bcc0edd9969ddb7b9b21ad8f13e6191047c6f1837d8556e0a9709f0c3e4dff66ee76c01a8a4beced5258736b80de6b91 WHIRLPOOL f299f625156bfd7618e5054e89e0293c596648f7c91c514341ccf00473c1231a2f7f04bcb19e0e3ed4cd949aa9cb67c6b8f312cbc7cbd1d089e742d2e729aa26
+AUX dhcpd.init5 2883 SHA256 049a231908dc2c5f82446712d71d5e75d430bd043b53eead1529f2d81e1595ab SHA512 d286094e4b58a15e7c44051df6c15e2634a80a93936370d76ebf360c87ef985720801b6e511d1222ba93cb6ddcefd8c94ed378e87ec083967f7299bb1bd13347 WHIRLPOOL dd83f4449d552fe1f07aca863e075c096423bc67513af58c96e625e80d4c504f0834fdf2879854fb04e18ac152a8814707feaf948dc4c8845549238acc1d3378
 AUX dhcrelay.conf 421 SHA256 409b895ed489e75c1a08f72961b45d641b93fd9357f528abc78b1fd036b7f730 SHA512 fd15dbaa4c61c3c26f407bf13dde859470a1adba134da064b653ccc152ce42635ee8de2fe113ae21ba8470e97e3caad8c1a47b69eb25e5e92b40e26790b96f6d WHIRLPOOL 8622e32e4c4681efd8f6087917f745c3e12013c04ab7ba666d72a2ce0cb55b9bdb13be13abaf7dd9d3d35a31d44bfd1d89d9bf69f6296df2b83a0b3b9fb370ae
 AUX dhcrelay.init 736 SHA256 cfdaff3a723be3935d06c14e171d4008f2ad3329bd05ac2e49c19bc0e14bc59c SHA512 4cbd52bcdf63d94ec38c3a530694e4bed29e1fcb1330e5f17db86e6e1d1fe6c75d6f55b2d6ef3090d98be1fc9b21ca053b319893e8a1478047bdb14832eef935 WHIRLPOOL 4d6925714702eb8214892afd9d5d587b5823f57be3541da1dc6904233470fcfd8fdc1356c508fc344a8697808eb208045a38983b9553c8c63595c512c6ba4279
 AUX dhcrelay.init2 712 SHA256 6cca726147474c600662b0c2e49eb5aa148a7a9af1358dbc56f16b1d08255ae3 SHA512 13dd120fab5c425987e4dbd2a03fac88822239c178d803b0277fe71b6319aa37b507fc1125a300c916115e725b10866b1f2e10ecc2c05f70345776084e869711 WHIRLPOOL df30792ce247a7fe6dbdc590ea83e196048fcfa53aae67d7402de60ce46662b74da0bd473523fc02cb9a4fee056ca700c0627eb73902eed2f9313cc062ec7ee7
-AUX dhcrelay.init3 800 SHA256 411fea507b997365606538d645b2bc75f5ee166ec805685f68075e49f2126dbd SHA512 4bff694a818c3791e9a853f3c53b4286e63231d4730ead6bac7a87b5839c02a7c9a49d6f9c88443e36edf7e5395bd397fc456c2a1db1e2ec57d36f8846852d13 WHIRLPOOL f5c0b7516db476983ded4cdf3df664925af1435eaf7eed7b0988ca701765fe9b53c55d1974318793884c409c3ccfdfad2e9d9855a57e014d86c0107431aedc55
+AUX dhcrelay.init3 809 SHA256 204aaf81d51dc119cee1d1ff3ae3dd50af666af2f8b2a363fd1bf442d4dcee00 SHA512 76b4b36e2e1bb66312c7e120959a88615c8cf26919fe308260cad10f374bd3460e6f8eef9a0f711d0436ce90460ac5e19d039ae9cd61261b6ce264345a06c3cd WHIRLPOOL a89aea861f513dd13f795cd2ae846db54f9e516080bc3f4aca02a87ed5473c02e74ebc9af2148f7aa9d6dd5f50be122b74ff95edb4d4d91c51c5429e37903619
 AUX dhcrelay6.conf 325 SHA256 099f668e1ad42ed9446b15675032a1186715d1fe9e4a1b24dfb787e68495d2b6 SHA512 40d3a6bdf8521bf5152cf31b961aea88b2fb0339433d0b6a6360a16c796298620b377bd079c0246e97bc9c0533ddb13bbb58cc5169d0ca598e3a51d1a607a9e9 WHIRLPOOL 7fcb1b63d12b066c6fc2668497d18ae33b739cca4dbcbc95530d762c7152c410a0af76e65ebb21f3c9c4a837b999799da4a766315e5eb667ccde64100b66b6fd
 DIST dhcp-3.1-ESV.tar.gz 797454 SHA256 e316b7dc34f05e38724273a473f823719281f229a71a80bc358f8e74687fd7d7 SHA512 50ed85f486e3db2093e8e92d4119a2fd427ef19bd47667578c8f06c8a432bdf881ef7864661a1ee128a4d25b3eeacaf0f6b79bcee25a8e7748b620b474ef9371 WHIRLPOOL 76ddf080a24babcd71f92f5eac0287a5942b623c172156d52ebfda89742ed55dbba007a7b27bc75dd98d271989b183803c0a8a4b503ae88d248180515335bf29
 DIST dhcp-3.1.2p1.tar.gz 792355 SHA256 e0cb405e0fef0ecebec7aaed294032a06178ff28be87498596e6069ccda4341e SHA512 b1125a0c6d7aea89ebabbe8b209f944cfde5ec92313a2f53cfbe4d9824f0453042ff494b95ac62b71d3efcf6f2d9e6284aedaccf5b4438d96c41255fc334600b WHIRLPOOL 6fe940a9d5c0c58f6a41bd223dcd18b05a45f3c1d37d05b49f8fc06dc137b9e9ede70cf6aeae0ef8cbebb2930b7b1090d6c03dd47abae12ea306602d762dbc1a
@@ -60,24 +60,24 @@ EBUILD dhcp-4.2.2.ebuild 7474 SHA256 9f15f5b2d35d9ff4372250886f3751b94abb0fbebc9
 EBUILD dhcp-4.2.3_p1.ebuild 7211 SHA256 663b373b3661a23ae1364ba18a52ade63022aad8229bc1b275cc82d110b07253 SHA512 469187bbf12ab52530e85a9227ae9d52aa617aa9a16732f21cb22e3987e681dd44b69f7c4dd3c5eb9ec207d8ab9ad34d1a61504d8a24c23eb3a494845ae6564d WHIRLPOOL 23a042697190429f090e31daedc663059c00e6228e8b9193e78f30e3799fa24bb7a3e25a3b58bed3e2e70d2ff5d625916a06b91d33580527005d96357082ee18
 EBUILD dhcp-4.2.3_p2.ebuild 7242 SHA256 cb357fc0589a09af61868fedcfc31dad70df8278a5ef78a1cd23ae96170ded9e SHA512 69eefa262861c301d5de344eaf45dfc88d211a1b0434d6898fc8bc802ec8804b7e588d5dec524183c193c2a8d41e95eaa0f2272ba3fb64a37641ce45df3fc86a WHIRLPOOL 5b0263ae207a72874c4d3576845d8f973cb768c22b2b19993b0eaa78f83f20984da74fbb35ec45725fa7f2b56666c26b7c26e39112414da194e640a901f248a1
 EBUILD dhcp-4.2.4_p1.ebuild 7236 SHA256 3d49361c1f952bbc3e14a46b872f33ae6cac102842ea6c6ac2f5ad326dd90da0 SHA512 d00831932a3cfdb7ff0cf451ccb29a22812a79c82800b4faad9d82289002728744bfa58046f60dcaaa08da21657ea10818a8eaf75f7ee24bb8d8d6fac3c136f5 WHIRLPOOL 47259067563ecb691837308974f57c98a4c79339ee19f6f2afc8b18e6d3e20425d70fda4a5ce731680ebc901357607315dfc7e82b6e1e54dfc6c4be0324d02f7
-EBUILD dhcp-4.2.4_p2-r1.ebuild 7290 SHA256 3c212c9e94f4e87ab423ace4f6bc2debd2eded012ba64619f68a94fc943acb26 SHA512 b0943f5343827b07d7a3682c838e113a50e673f17c2fe2a626b19d1f293715bc7610ec2d55b8dac2283d740866b833a0ae69f8969c791776b2c9d011c8568cfe WHIRLPOOL 99b9f5b13eef52ffc1ec0bb2ada79a6015277db5c5319be9a63db1a0407b568c05a7d27d828112aac665faf56ab6cb447c4ad7628232cf2cc3455dc5bc071c73
+EBUILD dhcp-4.2.4_p2-r1.ebuild 7372 SHA256 5090acec8bf6ba1667998b5d2b9cc6cb0357939c56afb969623e64723b796543 SHA512 46ec853bf1688d82834bc1f95d08c8e5f80c064e7de1c4eaa8343ba7eadd2aed4cfb1ae971b730250e0bf808535c36f799cd3b7e7875b2b60d7b1c0b4c3e0beb WHIRLPOOL dd9035ed298bc9cda5869920919029872484ef10035da9089a942d61dcd5c5afd60603c07d351dd735113ed19e4fcf8fa879e828b8889b7e4ef6b5a799942f1c
 EBUILD dhcp-4.2.4_p2.ebuild 7322 SHA256 87f59acbe90dc2d3120913a5b9d4d68fb32babf6ed97a68f56772f33b79854b9 SHA512 1cdb9a5a42f0110854a8ede59aebb657cdf4532c8a7d0ee0b8401f32c112a630a2ff78eace8ba2f357936e68ed4242e8244c4e2aa93c1eccb8471c91f6cf5199 WHIRLPOOL e501e3ba4f3bf1647017d43c1c9fd4a45853e0d6d9a43d9aaddec5bf7075b0757f95d471bec6797bb9e2c02e55991d31dcd928c711ca6079ae5f9806685c4ab6
-MISC ChangeLog 38152 SHA256 bd6852cc0c69911716590e2708f2b307f249bc3ffb7e359cd3a9b16e7e356fb7 SHA512 877412b77bb1ed1f157887f1fc8e684dc7f4089700e6d075b462bdbaf12f1075cc93262a01231e40ac25a40fa50bdaa793f8fbbdd88a7c0781195d8dace196fb WHIRLPOOL d91b28470505279916714c567609005ad05d7c4f07e003fe2878baa6fbd6bf48d681f3c09b455f709b7c77341f7e7003be704798c7fd0a4bb215182118c0dcda
+MISC ChangeLog 38363 SHA256 b20d581984ea0f7ac5dbf7d7718b04a4a4f0626bf4712edeed07d63b365a4597 SHA512 05d9175af2f963fcb6e0481d0c6c6b3b8782d21b390832580630628a7b0a14e8bd6121ba8b0e64d5ffaefa56a704b569de905f0af63d745edde1615c399fd6b6 WHIRLPOOL e556d1215c6d9ed8281676007c1e6802321a926543593a7335d373dd8eb03bb4863f7c91dc87ccefff26cdc00fbb401776102b6d0ef06fe27a1b1f262f6d4e5c
 MISC metadata.xml 500 SHA256 e9e4edcf7671391ee2f2af0917a75fc07883f1401aaa22b72dd0133bef81601c SHA512 52b56888b04bd8533e00930fddeccac3f1e6a4e6172b57489f52300dcf60191784fec25e94916dbc9ff007c1493fd8144ec30458b4de3589d31d6f2ddafa78b2 WHIRLPOOL 9631e8fe91b7874d03b4f91ab8ac3064a9c259433a7f27214580ea6643c3784f1988559e9c0336fd3508def32ea0ec7be74be20e8ff7d62f0d47b45b478e8714
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQoA2xAAoJELEHsLL7fEFWBRgP/RTwidPBHX2dd1jjHBx/ak/O
-AHxtj/v3OzQQlqL55zglPMOtTmc47ecQqiPOXhD2RZJ78+YidYOQzkA1dL/2MiOd
-257Ns5vEBrWrF01cM5YCzvdoAWbzXhcI5hFkdVIkIflsfqSCPEvJ3XanJwIoza9G
-qyI80CSH4lZX+NjIionbzdkDQZBiGtmLzNCLnUK0C5jPgA8m6+qTDqpG/Yf2NyxL
-0317Un5FIc58hXIgzil45a6g4wAyhABjcJWG7v74d6B2DicyNWp+zDVvjKtrUx3S
-NRgoW+guHYoX7LfMJxnevZXCKwcDSHhSaMXtg5A/g21C3JyGw9mHwb4hKtogZSbZ
-IgfZYkOBSmJwklvhR72dnKpueflM0VbMnDZKm4YbPycUkj6hABBweEg0fXQg2FqG
-sWgJtinp+wBb81evuxOguFPCpLawItNegVgymJ0muofC/zuTGgkJk378OBQ10CUz
-Qk1CZvSoWjeiwH9vrp6husYZTeHDn8IsVBefN3Sp0YPBiayCbcfRcyZ7m+R4UrEM
-3QeJFCe2Crr0VVegO1ALsGpVJt7zTSPu1ZaaGw8sj7BU5+HVog++HXVCyBibGS1K
-5M7gm07x/W4y73UbwrKg5zTy+rvJXIxWVAXUHW8vunzoOsIpGgjvm3fcyqu6H1KZ
-zqYhtw6D9ZnQ96Z6EBTn
-=QkIU
+iQIcBAEBCAAGBQJQoBusAAoJELEHsLL7fEFWo3UP/RHU0l1O4ZjcWQRdZTqMoNME
+nLVgRnq2v0LOevOP5AlOl5xK+XkKASsI4wN0VPBeKXqXau1dRNPJQvAl+yMQGhQe
+BnXOF2p4b5BAtDh1c/QZUCzpFjH/eoF7LHv4CvvMzrHJttdvoQUiW21mB6OK2rFk
+8zUlVQZAEHdR0ckCVYd82G3o9egiXqEA6j/bAOpCbPZxJnMDmkzh+gkR6AaYtoIB
+eC6E36jvU3m1bCFrPzSk3OzNLILU/oj79Ydxh1kHQ01hOyEWIvqgDEQ5yx7aGMGx
+/TSGKpIXjdFidjRDNTpjWUuIz9DY/ydY05OAlgew0LRy3DZw8Id9suPWj+CZqFcl
+EcIR0seADvPVUrCZ+GsupygU/wgWgp3Jt9BELNvX1JihbT8pSAse/x9bKHTADUFq
+CyaNm7ZU8/IHRdWYvFKI0sFIYwULRDHhR/6gadHn67PtoS3xM4Z4mXawMHWL9b9X
+hoE4fJx40CxVMNDnrN29wM1NhBwxxHm1uixouE3SVo/YTOWD74sk1KpeogiUXlni
+DTAQAjrDn7/1SX1Y5dBs/BjuUG0ELpNCYl0TUqA9Kt2sCYmUuppFLiSDTOGTGMC5
+GOmkq9I4OAvXq2qBp40QtyR+L5Clbe0iFt6qPo1p42ReHzz9taaO5Wb80lcPkFVa
+W2TRhUBJ5D5wSdBXVCVK
+=zYH3
 -----END PGP SIGNATURE-----
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() {