Version bump. Removed old. Fixed samba4 init scripts (bug #444016)

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

5 files changed, 126 insertions, 11 deletions

diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog
index 1089bb07f4f9..ae9d2452e172 100644
--- a/net-fs/samba/ChangeLog
+++ b/net-fs/samba/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-fs/samba
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.538 2012/11/21 15:14:08 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.539 2012/11/24 23:59:23 polynomial-c Exp $
+
+*samba-4.0.0_rc5 (24 Nov 2012)
+
+  24 Nov 2012; Lars Wendler <polynomial-c@gentoo.org> +files/4.0/samba4.confd,
+  +files/4.0/samba4.initd-r1, -samba-4.0.0_rc3.ebuild, +samba-4.0.0_rc5.ebuild:
+  non-maintainer commit: Version bump. Removed old. Fixed samba4 init scripts
+  (bug #444016). Thanks to Aleksandr Yakimov who reported the bug and provided
+  the files.
 
   21 Nov 2012; Alexis Ballier <aballier@gentoo.org> samba-3.6.9.ebuild:
   keyword ~amd64-fbsd, bug #430720
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 121062c52e64..117648e38534 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -23,7 +23,9 @@ AUX 3.6/smbusers 217 SHA256 c4e808dc0d0a397e777225c6f2b4008d52979b2a4969ceee3211
 AUX 3.6/swat.xinetd 526 SHA256 59dbb1e4669cfd5c72dacc8d8aed269f169e827338e6d6e92fa2a8e445a3ceac SHA512 37f8ac63f7eacf69b2610c2036ff9af3fcab46a1e74eaa50203db66c550c122337a19c2d87be955cd8c8a02ccb659af7ac1be35f49ab8add128601eef5c5ad72 WHIRLPOOL 89daaaa72a101112dcb2b2f007c10128f647846b509159770d6ff6726d22ccc66b2a2f03c09f2af9691ec956f59f1b43e499f1239a3a407db1d9029f3e920a8f
 AUX 3.6/system-auth-winbind.pam 704 SHA256 42c80d953da2472d789c3de1311045285428a15562f7ad2371ef214d8ea7bf56 SHA512 a93a491736299a67ec39eb06fa6b14e48038f618a4812ef9b2b46bf20ef9600ca4e0f44997d8e7c7e838760c3c53a739ebcdf1bb017a5f49b005b4470afb65f6 WHIRLPOOL 0601c6866bb15779bb7f5d7286902b1a5137435a92963a60734de98ca9ce95d220dfa456dfd4a229176e3a2be7afb9097bcffcfbd8b98be9bf206dded8054ad4
 AUX 4.0/com_err.patch 1276 SHA256 f0dc953202603a5f8c0625921cd89cd59e9ca74a61302bdf07e591836e6bda31 SHA512 62800c962cfb613b11c77ae9360f6c3c610bb1551f9ac3673ab814f6f8e1f589d1192fb3019f1afdc8becf8e692c8d19f4dcaa8b00aeeeb282642327c959c27e WHIRLPOOL 37d06f7f6d7d77acd9e5d794a6b2512aa092f04c553853045fa42e11f850a91912239385b21f8d76694e37d21d63405ea864ea0627a40aa72850b1fe4b8f4b3b
+AUX 4.0/samba4.confd 1572 SHA256 738d37dcd63d043ceae0ca641e3beea9394485e7851d7ec09dec54392d5ef519 SHA512 acd8c2151b619b030b1fc707de3252a65975a3af16e013816ed4b64b6581d873ede2dddfdc9b5522723ba938e51984cb8131f0f7531f24f32cc6829a234eb017 WHIRLPOOL daee50e72d79cb5b43760d7b2f3a35a6eeffaea4aac099f7d755c305e6023e0f235edd0de8bd7bee4e7fca0e26a5a139b75384690075b4380f72c50ce8a6c6ba
 AUX 4.0/samba4.initd 813 SHA256 8435ddeac4d064ada92664df03c46ee3aa0096692d5900478a86f8319acc55b2 SHA512 9cde8e5eb3f4ea7731489d96ff9025f9d03a6108ea68b70620bd9e0689a5c28349a478623e526ab7c436afc0252e32b21d1ab79810581242e3314c853268f78f WHIRLPOOL 30d3c3c3011eb94f5754e52bd4e2d3a7ae2920e9776ec66feccde2d89d6e867e08370254858bafbae06f8b8174a167e83d22dcbfa531c7dfb5b2ea0d37611a27
+AUX 4.0/samba4.initd-r1 1575 SHA256 4d00243dbd85ee81e2e989f1ac8035c1c1b9379133584291b959bb7bc45fe780 SHA512 941a4f8e6c839d11140c4caa3efd65176e11f07194e43f37e4f97f9c0e7ee4e8696093876c4b21f808cedcd80d3f7810b3fdcd126a8a0fa87e922299ea605e2c WHIRLPOOL 379166290c15c405c7ff50f6bf2654607282bff71546aa79279bdcd2a00cbb21989f42bb2d0be0588c174db2712b39b4e3eece56104b2ebe6ebbedccb69eb354
 AUX samba-3.4.2-lib.tevent.python.mk 177 SHA256 3eab52d42a0cbc070d011a131f9a56f4b3da10b2791fec514948fd8d2d013153 SHA512 0bd691d7678737fa815da9e1934db056fa833aa6d6d2d48cf8da559987a899ae4c5ac18e4b3594d634363f515028a3d30711484dbda578aa7506fbe2df55197c WHIRLPOOL 061b3e33b327563f52648931428cce433505353e73bf9851abb33f4f13e7c723c17c3413442dd343477bb0c49fd3284c0155ff59829df448952a6e1d07475251
 AUX samba4.initd 657 SHA256 4c8d1ecf42d58bfa1a2087ba9da55ed410ad238a0050272cb84c2e8d50b034d9 SHA512 3373f2ad30938dd8c2d68d19af4e248470e0b6d749b53257c97d3a0792df54f9ad61a33175ae3e576b728cc11a6ae5fd8803c22188382c7b50ca041b98b84ce7 WHIRLPOOL 25f6a313323b3076ad2a5ff733b1ed4bae1833bf5d4d1aaf9c75449e578ca479998b526a1fdfefbe5d5436c94cbcf6b38934bda1ddff8587f8820a2ccb5ce1e9
 DIST samba-3.5.15.tar.gz 30368870 SHA256 c23c67c1212b7ff2e68a9e047a22200e1ad447d5ac1bd3cf24363f4b5875d396 SHA512 917864ba014a3180583bf8ce9d89a61c17e5d8b19256a603420481eaf69208600e0e525b9036570dabc1136b2dc0e125627b6f495ad4292f68c1722f6865cada WHIRLPOOL c02d16056baf0dff0783b6f8593e80cbe21144cbf26ef0c15a806ef6520d2d8d263a052e41eba2c66fee1dd47c0385eda119c356665fae2978dcb64accc44981
@@ -31,22 +33,32 @@ DIST samba-3.5.18.tar.gz 35371052 SHA256 ff684a20a5a27fae6027fcedcedba10da73743c
 DIST samba-3.5.19.tar.gz 35379330 SHA256 96f64f3869408b6eb28d776a2c31035dd8b9966f485889a7a056f7ac2ccece8b SHA512 dd0492b0a85b23025f5378178b6f8c654a72a72ea8ad8bfab50b14be6826496fab922d1015853cb0871929b2427b109bf2881af04d135c3aa73a26eba4c5a53a WHIRLPOOL 47d7312a3f58b20572a0bc0ac3018e402bcfe3e76f07f99b31c45cec80a557b6a99dbb8e7c3b210df3c8f304e3b284ba2263512293c9278f87610188c8783c49
 DIST samba-3.6.6.tar.gz 34061741 SHA256 67685f2badf7451cb06ad60534784072947c3a845e4d0afec5ab7817f2ee9310 SHA512 f9045c57bbce04bbaf5540ee92ce78437d5f53bbf424384c1c6e5a1cd0822a4e0c913a8e4bfbe836950b4195a7c90ff29c1ffd9304d28d3dd7138ca69de05b4b WHIRLPOOL 5df2dea100d3050d1f33ab3144b6c91441c7821367596e2eb64ac4936c309bcbedfc39a652c3f14103bdc4e91c075b88a7acd2b41ddc839ef0cb5f861fe363cc
 DIST samba-3.6.9.tar.gz 34077002 SHA256 9714b50c1bbdb0d3521bdbf403bb112b5405040685cb0b4ff3f9a370d1e84020 SHA512 be0c9d2a51a524015a1210d96c775c754101a2906dc054f3ecae97d18d4e0d50de2ac48a85af62a30d020259ff91068947831e44963925efe3cc48c8051a3be7 WHIRLPOOL 4e4f091329517872117160e167cb60ce71cfd441a0b6eb46157aa48b16369e887b7373b9c2bada8751de62db10f8db748f53ecc28a90b70aaf38df3af2649b1e
-DIST samba-4.0.0rc3.tar.gz 22007301 SHA256 c067b8e939ae0d88e7d0fa37d3b19171e9794cd05167782f1ce5f177558bbdc0 SHA512 092b8f8f775eb250e7712e43dc429544a586c4447f9b61220bae75f3b14795d99828d7bf1f0ef29737c5d3286dcb9090f88f152cc5b2903a78eeccf929ef3546 WHIRLPOOL 811d4278f8637b5750d697fcc5f10469ed6ee1a0ab3cf2a3eb92941bbf31c4243b457015a67c9c360853b2657352b1bf6198b7ac6f780ca9f5600dba6294c441
 DIST samba-4.0.0rc4.tar.gz 22010871 SHA256 356607b2f650a6dfa558d61201d1cc4cc4ed36205b55e68d84cd8be0ef30f6ee SHA512 f1604424696e148a7a1b8638d3778de3ec9a86dbf31d585c2c176fd27516ae92a07a022d2bff88d4c0f27b4cd0c076692c0271e214c4835eb3e373026cdde969 WHIRLPOOL 40986fac28209484a128b17c7dcfba262557de2615295cf4d348ccad962692fd80543435f5271fc8f83d66f036084aa50152ded5765b2fe5e36cd3d3cebb540c
+DIST samba-4.0.0rc5.tar.gz 22017812 SHA256 d0179e8288d42e93e1fd35ceaa46b881e816bd57732928b8a4227c87f8a76074 SHA512 e744ceb11e521a5bb90e9a6507ef3aea1b7d0380a85dfffca1009b26fe111316b8ff35f1cb28315b85fdccd583c1ad9869d1b0b2bd84ed7195cafb293e797a51 WHIRLPOOL cd2eea538876fe109606507e78e94d520f5ea9afe3c042aa063eb310d5a03a9e281e6a9b9a947327890c6205413cd7610c7f5a33acfca32d856fdc8c245834f1
 DIST smb_traffic_analyzer_v2.diff.bz2 12226 SHA256 1bae7eafbe8ac2382313d5ab9d43d73ba64b63a714f0f588516952d476fb868d SHA512 aa0e457a0dd282e61e6dfcd5705c29b319832dca9711b1b5baf8373e2f079991399c3537c050219ccb861a93f86353ebff677a5c625d2e3f1f3a13ee5c4087d0 WHIRLPOOL 85ee72a360f67ebe71be5cd400ecd635280a0d7c64ebb8b94656a5ef1a94f74a987de86408af00ce1b81cc8363b1b3cf14726860d29b72ee610d4bab73d6b139
 EBUILD samba-3.5.15.ebuild 12388 SHA256 df87120eb18e960cc2d77d5158ef81d3dbf34a475e6a717ee12aea4965b98d0b SHA512 e581ec0818df37616df8a9aca4cb9efc14ec8a726ced6b1de4a541a44361febfaf83395a00bd481a846c4dc3c5b8cea03ccdc80fbd5b6d0990cc9014061c857a WHIRLPOOL cc44215e004d8b89223d553bfc9006ff3feac8ab640b26e41911041d7dc5ed6339451ef4c3307ab8d0df43b6baa71f781ab2fca4e6afac62715c5c349cb89f68
 EBUILD samba-3.5.18.ebuild 12454 SHA256 25350f9055a710f0496f70ef7a76c2d3780497aaddc3b7f9c2cb6f0080bad387 SHA512 0a496f863913d96f2f026d17f72e65401c6bd60cf21ac5eb932261095b57afbe2d75d73fb62ef960441c4637f1d0dcc7f3cefede2ae98ddf34e4573cafeadd94 WHIRLPOOL 3d2ae17ca180ed5586cd4881f039a137984cfe32c1f0c82814a997ad047e6379d27d1e74179e356f54beba8c1b463a2172b9505937de1aac5c2758051cfa4e30
 EBUILD samba-3.5.19.ebuild 12464 SHA256 936b24f5a5fe2d9fc7f0d5a7307395eef3e7fc0007cdd9b68f3ec7bc14c7ccf4 SHA512 03c4cb8cc9e73771753b39cf2fc1c2e350cd7c09bc08d0f3f0748d13769fadb0bb08a6855d8f27201412a6ab16cf32c2ce665a53d4d1714462de552ef66f6ab4 WHIRLPOOL b476ee0c7637cb43eb54541add97410c7ec2e5066d546aee7df40309d57978b63a5304a34fd779b448a530d8b0ada178e38eb4a8c43fe7aa4216ee6269e4ab78
 EBUILD samba-3.6.6.ebuild 11629 SHA256 ed6805f64cc43a221048de65d1967a694896bec97d3a091d3c870a3643f5f0d6 SHA512 2d811e55a0f61e8ea4386d5e2844bc22fef4b9974195b7f5507d673bda4065a4084cd177595dbf09aefc3f8a83866600e8c208a4c8cd2606ca155a7ae7498226 WHIRLPOOL d41c8869e82a321678b88566da1c85d4f5faeb83ed7f01237c9bce102c617dcbdb81aab133a058c010a75da54b09a9d1bc75483b2dff0bc89f2d435eed12f125
 EBUILD samba-3.6.9.ebuild 11830 SHA256 6588d7a94fdb9880ea5d8ac9e9b035ec950c14d57e5f091200d160311809dcc4 SHA512 a2390d1904386a4bd17d7ebac44edb066be8370ada235699b009e11bec0136dc958a6448326bd8d6504ce343bc0f7fe6830bc722776043cbe27215f45148c57f WHIRLPOOL 1b21ff61200bb9504b0e0d838cbbc88d980767d025d12c01f2fb7f5511f7efe33a0aab5918c7f964951474e4b32a3f0979b7fbbe2f8338a84ff53bde6463f2bf
-EBUILD samba-4.0.0_rc3.ebuild 4142 SHA256 7601cc4b19fee2389538489f74e13d236e355c1e3fa726be902cbcae200eace9 SHA512 7e7e883687175a5ddc988990da82fb75d84adf1480270932b074eb6d53c7f27d7b5cb57ec20fbded2357a8cd90655fe79b0c213ba9b87837f947ae4f9c9b7686 WHIRLPOOL 5456616ef96b70a83ca78d458358eddb19c7f9cc41f73633caa49fa1fde5a52997dce3cbf0d59143d7cf5d74803128f9d98fbaa58345083856b2175f1926d77d
 EBUILD samba-4.0.0_rc4.ebuild 4145 SHA256 b28ae387e3b85f9dac0a7845c0aa41a4d316242e049f285ecf8ebbf3a9992fde SHA512 1d3c6cc513a2ed19c754a651259746805099d405aac12ef66a09871d62264e3abfe94679746cb44ff209c0f516d6926e53d54c26a75d9a13d5aa966027d7c465 WHIRLPOOL 7169e755a85a4bec99f25e2f9a430dfb994f76487b8ffda999be242029a963a015573fcf894d9dfef347f544d35973939a3f92a84828afe6721f82a266cde161
-MISC ChangeLog 89293 SHA256 174d93714792a5136ead592cd3f483baaa0ccfe669a7aa54c7354f907f1317d7 SHA512 28400b6a0f4be0b0537c856c326744aa07b89223f40349dd341e436fd12887472c28c4e8f55b607fb9b941517d8bbbf335ee151ccf9496854ce0e76f60f2a2bb WHIRLPOOL 2c941973151d43c6f7ad550136947e9631a652106cc2756aebb8a83f9cb3131a5d5b3d9f10e95669f4ddba1036ae1596ae81b06e819a80de3164343a2cf7b85c
+EBUILD samba-4.0.0_rc5.ebuild 4235 SHA256 b68ed65c086f5e4829d1f1379d00870feeff45683239feec6245ad325d14f08b SHA512 7c03174e4cd2db111dd24512a12366a3104e437ebeceeae734f80caa2379958551ac949bc9d62523fcab5b9f71050aa4493ebc5921703c4b0607edb7611ea13c WHIRLPOOL aad45799e65ac5de203b6bf4cd28d69691beb7ecc5eef190bd53c0cef97ac1fade99e1c8394b21f7deac595f9293c4b4f6ad4014ddc79d95483c1b61293cffa6
+MISC ChangeLog 89659 SHA256 28cc98299a5325c33ef78307b5697b53a3e12e81995008c2bbd70d97335d12e4 SHA512 c6dd2c7e0c39be69999453011f9f9683a26f5901d494af384ecef7c58633846814544ad2d4bab225b06d7d5af9cbb5b10b916da83a4524b1950c76451de5f971 WHIRLPOOL 027443f90eecc09f9796916ee52528a2dde2ca394791a37e27e97ae79800170e33c82c7554dbf926c4df429a227171ec56267d2a6f72cc88c7cc66f4b33c0c07
 MISC metadata.xml 1580 SHA256 bcce2c1233c04b8066d36ca7aae3027c8618eebeea88ebe82e54cbb536c2a0e7 SHA512 38c688ed70818517bb21870872b39e478651b93d380cb36acd8b30c4db691d8157776a3f8eebf93731e6b7c2b5f06d96e202331d585e266a0fd3b12b890697aa WHIRLPOOL b8c85e3168186acd9c157b2e4541c6518a06fba8f319bea38f58078c0bd4a4dd6482a1f1a0eefda4d0cc41c4b4f22e215f15f48244a32e1e7710e71c8b3b8bce
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlCs78IACgkQvFcC4BYPU0oxvgCgm4NlI2DTc8yQQGWcCLBN15+R
-jTMAnjMRFS5v0exXFg95lFCuUYc5Bq5v
-=jYL/
+iQIcBAEBCAAGBQJQsV9cAAoJEPiazRVxLXTFeg0P/0zpGiATFuAk9UwVEf7ZmeWv
+mYdf85z06Edlo4zlB1q0LRmQ3x76hqxLH33v+ls5XPfFg9R4Qp78yHNQEOr8E9PT
+2ZVDWC+n111kCFdAbPnpGABmowkctsTqxmBeYN+E1QQrMFEmpE4/Kz/AK8Eu1W0O
+RBzLlrHNaje/OTKkfp9wdCCczreGpEVl7M3rLGdfzHy6EnHtIpqrUIa+irnmrdgz
+7AJJdq14AVhCc4zScS/8IHqOGNoxglvXg1GZnYp2Srp0oHe/zJlGwQge0fhQIe5z
+XffAHoH+mznaE27WxNn8AnxU4gIAmv8/PbT7epNHfzKi3YuqbPNtVvteAwzp6sok
+jgw0fA7eeQAbg4fX9yO+Ba0ow85aRL6uKAQ7dHFY6UjYxj1xmzBRdwBS+aEqn25C
+Be2Q5U3rADP8UfnG0AdXj25vGBTGPrrF+upeKW3q3rW7ugU4snIFR6FtcISuSB5z
+SHTL4GUKtoTNfysJtPQxbXXUUi1RfAnuH5x5NdbRb5LKpZcfm5foL2FcpKB4ox/n
+2F5bSeg38nVW1OqGLTngoJVBw/i/LxX10DCOq+fzBlQtwI22mq/StrFlTv6Mnqii
++/+ugooumd1IW37HRl3nqu974oL/m6HaNJ4qFMes9g0Sw/AQXVQKqvol+6BLhFMg
+GaQlM1QyQTxhxQAkJx0p
+=gh97
 -----END PGP SIGNATURE-----
diff --git a/net-fs/samba/files/4.0/samba4.confd b/net-fs/samba/files/4.0/samba4.confd
new file mode 100644
index 000000000000..4f6ee39a73a9
--- /dev/null
+++ b/net-fs/samba/files/4.0/samba4.confd
@@ -0,0 +1,35 @@
+#add "winbind" to the daemon_list if you also want winbind to start
+#add "samba4" to the daemon_list if you also want \
+#active directory domain controller or to access the ntvfs file server or the rpc proxy to start
+daemon_list="smbd nmbd"
+
+#----------------------------------------------------------------------------
+# Daemons calls: <daemon_name>_<command_option>
+#----------------------------------------------------------------------------
+my_service_name="samba"
+my_service_PRE="unset TMP TMPDIR"
+my_service_POST=""
+
+#----------------------------------------------------------------------------
+# Daemons calls: <daemon_name>_<command_option>
+#----------------------------------------------------------------------------
+smbd_start_options="-D"
+smbd_start="start-stop-daemon --start --exec /usr/sbin/smbd -- ${smbd_start_options}"
+smbd_stop="start-stop-daemon --stop --exec /usr/sbin/smbd"
+smbd_reload="killall -HUP smbd"
+
+nmbd_start_options="-D"
+nmbd_start="start-stop-daemon --start --exec /usr/sbin/nmbd -- ${nmbd_start_options}"
+nmbd_stop="start-stop-daemon --stop --exec /usr/sbin/nmbd"
+nmbd_reload="killall -HUP nmbd"
+
+samba4_start_options=""
+samba4_start="start-stop-daemon --start --exec /usr/sbin/samba -- ${samba4_start_options}"
+samba4_stop="start-stop-daemon --stop --exec /usr/sbin/samba"
+samba4_reload="killall -HUP samba"
+
+winbind_start_options=""
+winbind_start="start-stop-daemon --start --exec /usr/sbin/winbindd -- ${winbind_start_options}"
+winbind_stop="start-stop-daemon --stop --exec /usr/sbin/winbindd"
+winbind_reload="killall -HUP winbindd"
+
diff --git a/net-fs/samba/files/4.0/samba4.initd-r1 b/net-fs/samba/files/4.0/samba4.initd-r1
new file mode 100644
index 000000000000..b1d5cc91782a
--- /dev/null
+++ b/net-fs/samba/files/4.0/samba4.initd-r1
@@ -0,0 +1,59 @@
+#!/sbin/runscript
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/files/4.0/samba4.initd-r1,v 1.1 2012/11/24 23:59:23 polynomial-c Exp $
+
+extra_started_commands="reload"
+
+depend() {
+        after slapd
+        need net
+        use cupsd
+}
+
+DAEMONNAME="${SVCNAME##samba.}"
+[ "${DAEMONNAME}" != "samba" ] && daemon_list=${DAEMONNAME}
+
+signal_do() {
+        local signal="$1"
+        [ -z "${signal}" ] && return 0
+
+        local result=0 last_result=0 daemon= cmd_exec=
+        for daemon in ${daemon_list} ; do
+                eval cmd_exec=\$${daemon}_${signal}
+                if [ -n "${cmd_exec}" ]; then
+                        ebegin "${my_service_name} -> ${signal}: ${daemon}"
+                        #echo ${cmd} '->' ${!cmd}
+                        ${cmd_exec} > /dev/null
+                        last_result=$?
+                        eend ${last_result}
+                fi
+                result=$(( ${result} + ${last_result} ))
+        done
+        return ${result}
+}
+
+mkdir_sambadirs() {
+        [ -d /var/run/samba ] || mkdir -p /var/run/samba
+}
+
+start() {
+        ${my_service_PRE}
+        mkdir_sambadirs
+        signal_do start && return 0
+
+        eerror "Error: starting services (see system logs)"
+        signal_do stop
+        return 1
+}
+stop() {
+        ${my_service_PRE}
+        if signal_do stop ; then
+            ${my_service_POST}
+            return 0
+        fi
+}
+reload() {
+        ${my_service_PRE}
+        signal_do reload
+}
diff --git a/net-fs/samba/samba-4.0.0_rc3.ebuild b/net-fs/samba/samba-4.0.0_rc5.ebuild
index e74ae3b443c4..27edaa5d5a30 100644
--- a/net-fs/samba/samba-4.0.0_rc3.ebuild
+++ b/net-fs/samba/samba-4.0.0_rc5.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-fs/samba/samba-4.0.0_rc3.ebuild,v 1.2 2012/10/19 08:10:00 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.0.0_rc5.ebuild,v 1.1 2012/11/24 23:59:23 polynomial-c Exp $
 
 EAPI=4
 PYTHON_DEPEND="2"
@@ -35,7 +35,7 @@ RDEPEND="dev-libs/iniparser
 	>=dev-lang/python-2.4.2
 	dev-python/subunit
 	sys-libs/libcap
-	>=sys-libs/ldb-1.1.12
+	>=sys-libs/ldb-1.1.13
 	>=sys-libs/tdb-1.2.10[python]
 	>=sys-libs/talloc-2.0.7[python]
 	>=sys-libs/tevent-0.9.17
@@ -128,8 +128,9 @@ src_install() {
 	mkdir -p "${D}"/usr/$(get_libdir)/ldb/modules/ldb
 	mv "${D}"/usr/$(get_libdir)/ldb/*.so "${D}"/usr/$(get_libdir)/ldb/modules/ldb
 
-	# Install init script
-	newinitd "${CONFDIR}/samba4.initd" samba || die "newinitd failed"
+	# Install init script and conf.d file
+	newinitd "${CONFDIR}/samba4.initd-r1" samba || die "newinitd failed"
+	newconfd "${CONFDIR}/samba4.confd" samba || die "newconfd failed"
 }
 
 src_test() {