Security bump (bug #504494). Removed old

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

8 files changed, 40 insertions, 963 deletions

diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog
index 8e39ac67c0b9..d62324f08717 100644
--- a/net-fs/samba/ChangeLog
+++ b/net-fs/samba/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-fs/samba
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.655 2014/03/13 15:35:07 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.656 2014/03/14 09:30:41 polynomial-c Exp $
+
+*samba-4.1.6 (14 Mar 2014)
+*samba-4.0.16 (14 Mar 2014)
+*samba-3.6.23 (14 Mar 2014)
+
+  14 Mar 2014; Lars Wendler <polynomial-c@gentoo.org> -samba-3.6.19.ebuild,
+  -samba-3.6.20.ebuild, -samba-3.6.21.ebuild, +samba-3.6.23.ebuild,
+  -samba-4.0.15-r1.ebuild, +samba-4.0.16.ebuild, -samba-4.1.5-r1.ebuild,
+  +samba-4.1.6.ebuild, files/3.6/samba.initd:
+  Security bump (bug #504494). Removed old.
 
   13 Mar 2014; Lars Wendler <polynomial-c@gentoo.org> samba-4.0.15-r1.ebuild,
   samba-4.1.5-r1.ebuild, files/4.0/samba4.initd-r1, files/4.1/samba4.initd-r1,
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 4c259c2458a5..3606e14a9172 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -16,7 +16,7 @@ AUX 3.5/swat.xinetd 527 SHA256 7919926945c9a7a28446280ea477aed2d7d3506372a03cbea
 AUX 3.5/system-auth-winbind.pam 705 SHA256 eca81593dc1b3e2be19bba7a128d71474243216a7783ed788320ca51cf6ea6c7 SHA512 5b71d93f63855481e202cc7d7e5c06bea2db93cb03c268034fe572f915701c553766d28cbd38ba33882a89790df239522db0e83572dd72398bc203d4576289a9 WHIRLPOOL 0894a6567a30354a4aa24dfb7df6c500fcde912c611ece7ec7620b96a9f4a1b6f7965e0002a7bc3250e240b5bee5fb59dd2c6021a257216656a830bca6b5cdfb
 AUX 3.6/lmhosts 125 SHA256 0bcbc9c3cfb44e31ccdc0930a1bcacc4e2b0fd96e5d38a56234a5133707a1826 SHA512 a742544341c0d452452d55a34f0740dc80d6e21a4ff8793e62e4d69626d5e2629ce607cb938d655e35a3585c8e0f796f4c73455c841b066d8392890f05b163f8 WHIRLPOOL 2d4aa96b24a74d6dd932f784b180575500eefe3f39e5e14512626a48bc1a9e90754b2ed75615e161a47c0624db3b1c156809991a54c4501abe6c8bcf746d6f64
 AUX 3.6/samba.confd 1210 SHA256 02ab523d695b5ae044b871923ad817f8931a6c20c5bfefad98a4369d7b3742e3 SHA512 34326cde9fa6c072d9b948692b292531e60a05043767ec8be78329d6e99793a16dfe134797d90da2a48e240ea5ad6e4e8ea57046732d02f71f2f4dd5316bd313 WHIRLPOOL 8e1633095d0f1540c4ead736e68b36c196b9fd760ba7f80c945be71918ce5436d64679c0314c2f58c9ef88d7be0432d8c2b75c29f3201857beb729a9c8ff5726
-AUX 3.6/samba.initd 1250 SHA256 3eabeabbe203fcdcea37d53048bdbf7e6cfaaf795bef8b98ec37aa572e57d052 SHA512 c28877c5def52c00e99cc62e7c0563f46ed18367bb6bc4063d70a7429fcf72978ace7efdec0d2424c51bb3a91afbf00e3e52051e6444270425a7cd330809d6b2 WHIRLPOOL 575d02078d5de6dd6e18fd01b0c1a5e1cc82725a247eeead52a8248f70bb8a527c2acd426e11d0716557f9b56375dfea9bae0db197a8b76f5d605d9d0b32a0bc
+AUX 3.6/samba.initd 1266 SHA256 88e1c26ee39840f055c66fb59161c33497cc71883286fb61d5a6fac47836b97a SHA512 1e0430cca96e478dc7cc722954d77cdbe11d5569ee56ee3a307b75cc5a0c14402711a828e34ad264e725cba5bf3b25b32a68bb49ca85058ca2ed707580432183 WHIRLPOOL 27f74c4b53a3ea6c334114db9f161f3446d1500dce701a877278ddd1db3d84851c8c05423cc730a0cc0678ba4bfd78e102ac0e44dfe5a82ca7fb64832fb71bee
 AUX 3.6/samba.pam 397 SHA256 86634f2d541370518d0958a73c04776ed5df2a3716ef128ff384459acce9cd38 SHA512 cdf91112dbd4a632da13abb16bc6450a5e43cc6d0f6ccab4bd62a880855824e80b779d7e9b017680669d23f2d9c88e7ce0848ccf7e3eb7eb73c3fd3e6a6eafa4 WHIRLPOOL 8c223dfbe4a122d8d641a52209ca7d5c09b964ad7dc3d203da468df32e58bcf94e11b3eb7c3aaa69ad343a8d5f6c0bde0bbd18dedc8cea998db24e532f08fd93
 AUX 3.6/smb.conf.default.patch 2385 SHA256 2140436e553e5dfc0b472e3a09a597de61f15847f23e8f92b9f561a6b9164034 SHA512 c321782ed148217fc43fe71664ace833e3127b4dc0517ebc898ceb2c04946d159efceb91251112f39a4aa84dadd99964e13192d020ce4f46ad0efb84378674a7 WHIRLPOOL 317fce352f6f2aae6e41927f526264f747f8d0dbff25d88878aed4ea21afff4bffa86de55112c363710c190de9eb600c355e46eb65de4d5550b9f71c29a9bdbd
 AUX 3.6/smbusers 217 SHA256 c4e808dc0d0a397e777225c6f2b4008d52979b2a4969ceee3211a8bd9d58703f SHA512 6f4b5e2bffda390e08f376db0d61e1917c2a9c493d1365a54d672b07eff9d48c56cbf37c268e19c335b4c0598f0b5e1f3403bded467cd6e47a7cccdc3ae3abdc WHIRLPOOL bd53dde668eca5b03632dd2938829f184cc6b97850c4e483e999acd4e3dcf960bb392ce42ddf411bc07bc615a4ff641797bb37a0f3b66343bdf04a60910f4357
@@ -42,38 +42,34 @@ AUX smbd_at.service 145 SHA256 909dddfd80982035739081d86d2c524f6a25440d9c10b8a80
 AUX winbindd.service 240 SHA256 755036bc419cce90200ac3c04986fbb7cf718c128c2a1288c634658bb779bf3a SHA512 f1ce6d035e8e0fcdc73f14e3b60c9647043777ff6b2a982a81ed07eb4df5ff245a9511e3e4a9d8163f9c8f3fb86d2a39a67621ace68392eb7c2f2e2a55d587f7 WHIRLPOOL eb4d7f30b4ce3341e3d24a6c05965bdce9ded78a7327b44d3d04d00837d6e8109857b1fb1b78c8325680588cf9abe94158755a962fb8f7e8dac04b336308c268
 DIST samba-3.5.21.tar.gz 35377315 SHA256 fd9a66056b1ba9496762394efff41fcaa0e58f2e50e71910e6d202b8a59a1c10 SHA512 e6d52530094b2f8284f8536f97411c3944a83e9f1a808836acdca19fe4aee3cc47e136cc2a2eab96ba89526fe289ec1a3d22fb836bd261bf7c8ddfbccd1cf975 WHIRLPOOL a476ea24841cfdec0f640880e0362173a3f6b957afd2d2448f7b4a8b7c927ef558fd22e7fe20b05bd8aecf1169d8e488b87830a99ddfddcbc8be0c9a414966ad
 DIST samba-3.5.22.tar.gz 35385144 SHA256 b4c98f77f5634478da109063334acd9b6ad7bcb38151a5b1cac6dc5feb6679dc SHA512 0e1b4816d921ca82f0426a254cf103066634cc54e28d707a62da951118413f7f5ca5f87d60688cab802a58b0af87f797fbbe12f4e1284d5d7f545a98aba97616 WHIRLPOOL 6e59655dd7a537f0c7c889c43ddf5afb8060706e1ec79b3835698181c5c7478059f91c93eefbde50b03e0154a686eda35eabf807bb7ae01dd2b9b39648a009ae
-DIST samba-3.6.19.tar.gz 34115773 SHA256 addecc6acb05d3ffd0934f7f91d8e83852705b9e858e13c506e51c297259a92e SHA512 5d1fcb4b178536061e7ae7a61befbb84c5fce0dba805345a25ad3d393f04068f0ade719aaed42844d4541e64d6cbed28a06b0793e1c74431a4ad5a2cba6bdcc5 WHIRLPOOL 2cafb6a250b9d5b8c22a8ca1914f3af1b8786554c61aed6060b151a971a1169e28196df5e02b35fbc7abc60622e3aebac24022cfd0b4656ca4e51401816a4ab3
-DIST samba-3.6.20.tar.gz 34112208 SHA256 5fb5daa65c06c890cdc938fd30daca40945afe2880e6a4b95b8eea418e003a0f SHA512 c87233f00051b98968a9aed1aa7c44e44bb0195efe460a55bd2541a02732afc02115fd6f5d75b3a9df568bfa4492d17d03f2fbe8b8dc6a5f984da87668b6708a WHIRLPOOL 22df9b68ce942dcb8a867e6a3840775760dc2017ba8691a17bdfc517b501147a30c4e6e50ecb915b97e7a46c22ae60d19ed813265c79001f6d8a7a009397a408
-DIST samba-3.6.21.tar.gz 34116243 SHA256 6b960abee66058a9390be036ae42efc463790b2cf4c53f842660fa36a3dc979e SHA512 c9ad1cf019bbb29fb34ade6dfebfa23d2a56fe05878c5f4f3660b406a4e3415c77a14862d34c7fca9d7da7527a1866fd42d1eaf2090a81e00e33581b5afa71cf WHIRLPOOL 42f381d3eefaa48e356d0fd99358e77b15adcb005b5ee88b3d364bd0ae1bccf231afd5c76b860811e09023711c34322b11d13cc9e1a298ed84aa93ddbb1a59e1
 DIST samba-3.6.22.tar.gz 34122131 SHA256 30bdf20e7788785573196a33905e7e27083a32d749285c22958edce0721cdeea SHA512 13b7d4c7ee24434626cf7e835e302252a281f00dfff1b83fd3c28f8264c1ce7afa0aa6ad237c28015fd2a39a38954189a140b36c27d8b0434a48b46d56936981 WHIRLPOOL 0daaeee4a7c7c3807ceda6558041708cca6c28ad20051cfff5547477f2acab8b896a4168f44a85eb7722dec5d3772bbc59566e79e1876820057f1f3107962cb5
-DIST samba-4.0.15.tar.gz 22114484 SHA256 2866aee5ab46a57cff9838b25e6960b3ca75218195eeff0823ed72b5dfd464b2 SHA512 a98c42fe07e26f7dd12d364e279d591216cbfb0dc53e41448d4e60482a8af13e8900573926c496be081b057672e82fa1ad983f1a2e02046b749c6ea37942c365 WHIRLPOOL 8846be2a562716c29522cb839549d5e68297b636a7c1c08a99fe6a33fa0d0983da0c4b2d83555cae93e90792af46b13425b03feef38fa8e6ed4d8360db327fed
-DIST samba-4.1.5.tar.gz 23177512 SHA256 d98c1554d6f857053557ff024c243df5d15dd9ca436d5804be4b0546ede94cc8 SHA512 28226cc3e5381dd6c3a6c28c4efbbb68d8df9127903b1976f4cd7f80dc5ad14109e5d6ebb80a3c918d711cbe2f02a01d4d2375895b16f0bc3d0c6ae4fad2de4f WHIRLPOOL 17e84c523ceb2b2fec6b32b8dceea87500e6af6518457462ac72b61ddb6a10a706703335812dbcba2f17fdcc3f4c679150396d8bd624b86c930b9faa1a317d47
+DIST samba-3.6.23.tar.gz 34122387 SHA256 25bbfa81b9a26609a0be744240b63e1f5030bbcfab684cf7aea3b86ed0db2dd0 SHA512 54189079a4f65f1e9c818f9edc9d862c4261c3a4925146f3ab19603052d2c08d32b59ddc243422683338dc4f1192b22f02acaa719e11aa44146c5d3bb11fdcb0 WHIRLPOOL 4919b8911bab8182456ba5bcdc264ca028dea0300bce409bcad338965936849c61695bc99af6e006f373a0c502cc3bf1a596d52d706181674ca2b7bc5aeb19fc
+DIST samba-4.0.16.tar.gz 22113747 SHA256 50f45bb2c90fdef958d959b1c6bbac57731238e268301d5fc5e9bf304b62ed15 SHA512 e449e228a1603d78401d1ee4adced0f3911dbc3a07f19ed65d571d304a457c65fa7f190815513cd365b15fae29760c6230b0c2803df31ea0f43213fb79675981 WHIRLPOOL 89b9688f8e2bc04a65fd8edd8a3af780e6a1fa4029d089928ec8cbd9572e9d3b8d6fc1a6b25d103ada39ce72151cdf5059e83517766aea777912f958d19bfaf5
+DIST samba-4.1.6.tar.gz 23177462 SHA256 6d3b25cb70acbd75352e1a6039093689ded373f6ac755c207635416786532e6b SHA512 3eaca534c475d57962088df6a23ae7230e05da4696b5b9314a6f21bff669bfd50c7f2abf04eb62462d69866545c8429f01d9886014c526eacf4009d81c8d7ff8 WHIRLPOOL b4d0e76be8740c54df07bb7e134c4727127be87df710cbd1b3e872c27a6b57bcb8499d2f4990eaff52031dd97280c654c995c2d58c43f101a840ab6a81b94e8b
 DIST smb_traffic_analyzer_v2.diff.bz2 12226 SHA256 1bae7eafbe8ac2382313d5ab9d43d73ba64b63a714f0f588516952d476fb868d SHA512 aa0e457a0dd282e61e6dfcd5705c29b319832dca9711b1b5baf8373e2f079991399c3537c050219ccb861a93f86353ebff677a5c625d2e3f1f3a13ee5c4087d0 WHIRLPOOL 85ee72a360f67ebe71be5cd400ecd635280a0d7c64ebb8b94656a5ef1a94f74a987de86408af00ce1b81cc8363b1b3cf14726860d29b72ee610d4bab73d6b139
 EBUILD samba-3.5.21.ebuild 12311 SHA256 2a849451f886614315680b28b944840d1c670a2b878329773de63a72797a6fa1 SHA512 5006f1afdc2df93f317d15e1e9781bee20eb0e17e4a15892cb5ebe8bb2ab0a7a56bbbf2ed67099620391eda14b53a8fdb78a5ee9634a489915fcf84b031704b7 WHIRLPOOL a295b28990480ed3e13cf76d4f04270739b2669837d5ea93691888c488ee10dad22cd4bcc2037b09e66be41eda4d3d2e064e28701acb1f2dc7acf80935283123
 EBUILD samba-3.5.22.ebuild 12309 SHA256 dc195567858dc0c11b2b86fc42427e1066c5efeef29bfe047bdbac413a62007d SHA512 82125fe1d5ba33f57ca06e513090eb0f2cedcda3242773b8734b4b0a18c68ab12f9149651908ddffbe3b2687b9876491a6cbbee7dc4f1e0584a5eef218ff8a57 WHIRLPOOL 9e87a5fb631fd519c2fc89da8a1a591fc9a4eb58eee63052f09321a6f115dbd82e8dd383843b6e6feffe68edaacb4de5c6ba6e9e66a098fa0cddc480988776c8
-EBUILD samba-3.6.19.ebuild 12764 SHA256 4c48786cedfe51b1cf7e0033011029c89e6ad51143f497d9de5a11a99d4fdbef SHA512 bc3ad37d66e90a3f7d2c408f6add5333d79e2bd6620bfd1986c0edae5acc3ae13e96a094bb81e14dd23c69aab8b91fbecf36293058fac48f742d1b746d9ec046 WHIRLPOOL 808174cfb900b5e4e5ccea43bfce6e38349f7c324567e55edd68e8b2ac45ce855a6ef61e7dc06671b09160afb1e9d17825acc59656f8bebf529568a77b5921b9
-EBUILD samba-3.6.20.ebuild 12759 SHA256 6a5e1e111b31b3ba87f632cae0feaec281ee910aa08aef6cafc6ab14eb94b7a3 SHA512 e38dfbef6126f910095b01eacd56a049909178dd82f65c3b652f1a6ac418bb75c810a66e6872623ed43529bd63d5540efb9c59b3b81436bb9a1bf0f1d3745bd7 WHIRLPOOL 9b5efa9d5ab52b1f1352083ee6f12bd50bfb86d4f81c668007f0b4f141caf81592daa8da5b22111f067356b6df04f61a99a988048a8e4afe1193e6ba3429b9fb
-EBUILD samba-3.6.21.ebuild 12812 SHA256 9fc75de96f03115d6e1404879af7175c3e13a8242ae308e30280f9ef80929e06 SHA512 9f3a1b6e4925786e5de9ae46a432ccde53e75b46624ed204a401c4901d6832880760a51bc8e32c94d56b4d197a22e2f07a75a2eacf4d5a14dfa03871476286eb WHIRLPOOL 2f7087c03d4d37021f167ce710921ec59804296ae6c517ba8feaf9626fa7835ebd4e133307b191f4367b4f61c23d2aa3c8975861dba92eddf952d5cfe69ade79
 EBUILD samba-3.6.22.ebuild 12795 SHA256 c762901545642fa9a73a20215dfdd59f68016f9ff52bcc075b089fa69a799815 SHA512 c882fa703e9bcae93dfab822d91a24f3222c748c2b371294b7610a031e55a142702ff7bce361bcf6d3578bd5100fb5b6246697e89c1ec3f104d546070d108c18 WHIRLPOOL dd2d473025a081aed8479cfe16db0e180a00baa0e71bff6c0c171f13e01e9af496d52e549e4ac18d05b0f6d1008c5e758ce8c7d010ebaac4853a481ed8ab1dec
-EBUILD samba-4.0.15-r1.ebuild 4870 SHA256 9e8501520ffaa19461d0373dbb9ab02db4c876c1d6202df0ae82c658edabfd6f SHA512 6145dfce0323743624525522f1219ca5810340f9870f412485dd8ee37918941e5a5821ea413077b7f4af658eef0ca6809fdb059b12fd13faa7d3eafd69bf0ed4 WHIRLPOOL 6b23ed01e866959253d2ce4e88f02e44b2e4410ebce1d67cf4ba03e3c076664f2b3031b4e4d190b82313565800a745e1720130ab26a149488be6cadee692645c
-EBUILD samba-4.1.5-r1.ebuild 4751 SHA256 04ec7e2b43ad370f6793f5211b124b1958e8ec410472458c462f551f5a5bedcc SHA512 9b3b6f83b3f8834512335bd21e84bf1d02a8817d3447c5d7f5839a055c37948d6db8fc9e5997977de1c1d56023d1105b12236c98fc5779f0e21b8ad9339d0e39 WHIRLPOOL acee2cce18072046f0b4d9e22c1fc41e7f4eb3f47b7add9eb5b60e4cef3c86ceafbd084232ba947c9c941217562621bd6d8f94266506e9435213ac8fd6c79492
-MISC ChangeLog 1909 SHA256 05964f99ee36741ac4926d29dc963d91b6259cb7b6c87210175e42a8eb7cd3b9 SHA512 8b56b2752639e3f1d19d089855f45b3a5d5265b1e2333e49469558945f9f6f1d02dec9ee27a908113dc7f6b7e1ff664518ae7dc20be30d592f51934c20376f5a WHIRLPOOL a7d0051e9db8cfb1cbee7fd19b28d7c87fba5a9e59003b6642de394e68f565552428c223d93ca648a4d79ac18631e931847c22a3b3974e3a36a708e7d7c16612
+EBUILD samba-3.6.23.ebuild 12812 SHA256 0a292b0944f2b9052173a2610aef09af7c828e14e1d17a2259da0dc7ff6fcc34 SHA512 5a1479c0d971987f3903ebbf76c994317e9e55166233bd5dd00cdd0ad2df5b76df35e92baef2f1e658df8a8480d2e7f2de020d83d770e4adb85b28069de67426 WHIRLPOOL ed7e6b71452dd27bc5d560244d87f78c44fcc4510d2e1edca7493c7ffccd3a8c60b2db626d9a3e81dd96c1adbd2e4800bb7c91e1cb6194a3b77403945918da55
+EBUILD samba-4.0.16.ebuild 4867 SHA256 3e32c48e5c3b470bf412e74d9f45e79e100364d26f54d3d4d5fcfd5a7a310059 SHA512 cf70e8f37260a1cd1dbc4d6d9282c69fe298a3879d97e7865fee1dc38bbf1c50bfc5897ad48fd3caa16bdebc1cbad086447df74682b125b3ddf8c50d0d74e419 WHIRLPOOL ac0ea0dbd2e135d5183ae77f3be30d10e063e043f00e08e3e710caa16886c70fb47fd7dcceec3c28c9a53728750584d003b3055b38fda066858d98fa7ac60ac1
+EBUILD samba-4.1.6.ebuild 4748 SHA256 f914f52a788afcd5e1ff8328896baf261d7ed3347a58caba7734b751852f3501 SHA512 5c9b1406becebd8a91c57811c6f0e6ce35514934c9a35b8273ef15e3521727ad8c51272b28d9014e24f8a5852728299c5933169529d3cf7592c7c3dcd6556710 WHIRLPOOL 0c82aa42a50b2aac785ff6cca715fdeba52a8e722a78d9ba8d11a60e3e5a071d73bc89e58ae87598c580f533a03de9ae1a2116a456d29021944a8d0b13557106
+MISC ChangeLog 2301 SHA256 da39e461cf3f5954a4a866fbf0e614e312803cdaec8cc5da9599268146506361 SHA512 0221fc0bf3702ecce1c3be44ef96653c92f9b0b07a1dff49d321d4de044d84a87408f47927f1609b582e4e2827ffd1646661e8f7db8bde2d04a214d7fd3d7a2c WHIRLPOOL 69853d6d5f1160450198757a4547292e743662afca0079b980a9d6babee549d9d6ec8043100d16c4b7def64cfdd4f2c1c3c2b7136de5c010b576858a3c571a1b
 MISC ChangeLog-2013 106689 SHA256 00ac832a137c7ce1d21be794b45339e1f4e9c51eb1b796cbcac90a03e1cf5453 SHA512 9dc4e4e22042db7f5ff3a474eb7a454044ea6958ffc3ba5c5de6f09608cfbbcaed8db00763a38995276de03a5f1c728fc783d4addaca7da16f4be76a4e49fd6f WHIRLPOOL 85a746ae34c0386ecb151f5f323b92615cce971b1e46f249cccfdc682bdddd7dad080dd4ffbe5748f093ee11db3f5182cae6d85191a37014639a56040eff9644
 MISC metadata.xml 1514 SHA256 c10deb71703017ec67f4e5bac297d9b4581fec3d8b5549b6aea2a43bda642bc0 SHA512 9e67e8f7e0c972046e32bf4539142559c24183d6c3469e5af2f901728a3c02a9fbfd50e948a9fd414107fd0cb2a8de709ffe3fc5bf3372c77a4a3db6dc622ecc WHIRLPOOL ec92ea6a1b03e70c791670e97e7d9e07e6bdb82c24ed08c186e786afcd009ab63fbee7d481a4cdc394632ad312e58a2048dae3ff333f6f7a1ad19add55e2c8f8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTIdAuAAoJEPiazRVxLXTF1bkQANTmgPVzM9RHgkFYfFAhD3Nx
-UTgemItIaBDs7Np6TtzjZWdi/EEEQAj0izqGDN4sNMpubL9ccubYczIdUR7xYN17
-7eZNi3gqNrVlutiASCydnciirqxS+2TeJjJVuT/Qusa2WAwewbAJYhw92HupN8Fg
-P3ZRizPoy/CcSP6TbwnVQw0/CO753frTyHxoS88UEkQYFf5ZIj+nZBkrPHPrd5PI
-Yy6zeQoUHldz0dreIHtgB70Okn76KOKThWU7rNF1Tg6Wx8iYZWnEts/1jrPQX546
-UfPTch9zp7MhL6xrme/wFc1MpOakeqyXhynxgbOMxJggcF9HjGLYFiOUgXmE+sbg
-VbBp250h/lussfluRm8nZE8AWXMfA/5OUmNOn0bPGJXx6Lu5rtQqfi9WMuoX2Mnn
-8KjKxahfODgvhp2DUHBMVYbDqB60FzUK10oDC7c3vXTbAhCWFAzmhQlu6iuwUsA3
-EMUJf56+fmu+XUos2YS2ZieFR/0mWbQJnSI4ly2nDnVQVJ4gQvJ/JaydeobFPxsO
-+s5eDnhXK70VK56vYVqR4o0+ifdYjQfNquLRyAhPRViX1k/LXw1FsOLf7rxbigb0
-gsJ0+JuOoLJNtalxn6tzxNv8yS5TiSb320AkoUr25cQh7ENBFCVfhCfoggiMkefu
-aMLyYaomghvXoxdo9rV3
-=gjXz
+iQIcBAEBCAAGBQJTIsxDAAoJEPiazRVxLXTFbCgP/RVYeYd5AKi9tNHQo3lY+IKb
+qt/4jKQuW3suHloGENYn2tYVVZikf2xUDQBLJ7O2kCxhoqhEzHcLh8ZKqmIDMy0o
+ZexpS1ELcEPv2W9MrsibLegn3o1Zo1jSqiMcK4gYoAPq43Jf38dZjbW48umQ3X8s
+WKbKT7BnYDd4EmXJXBJT6NCaN5DvIGrz0jUNknmOfw1j2hHwXFuLOPTHuZ3BY41a
+VYizcHEWkrj+FeS/sHrMep6Z44uPKYh4jwHAa0MR5+3StuKiM9ythPItGvw5OQvE
+v7KXXfMRRCEYkcP7qgDsxeEAmGEjDKvPUviLCFHk1qf6nz1ZGSYJaAV53tDT1OkG
+Nysm1CnIW8HwZvOXrc1pvcdCiAV3hJ2EOU6J5cIxL9EJrMQgQo5OeZHrwq2uD/uW
+Ui1CPiRutFpCQjcmGReO6mgn+mNNygPePhNCry17WAvqux8Xo5jq3lAb0eS+GEyu
+U/h77OMKzE2c6men1YEQBaM2jL3MNFzlttEiUxoGrgfz5EfBwX7BMEHK3IJZjkMY
+Avhyy+IBYUDegUXMDgOEL5sJZU7E+SrvmqEg9XCAsWX+/BjKu4KYW04rSI7p58pO
+fOrDj67Izp4l/wBFQJHiIdHTgNbePQhXFM5yTRII7sfOH4aPp2SyGhs/N0vb6RZ8
+Ai91yX6O9b97G8XbA3Gu
+=RfvR
 -----END PGP SIGNATURE-----
diff --git a/net-fs/samba/files/3.6/samba.initd b/net-fs/samba/files/3.6/samba.initd
index 779ec09bbb93..96bb94ec1875 100644
--- a/net-fs/samba/files/3.6/samba.initd
+++ b/net-fs/samba/files/3.6/samba.initd
@@ -1,9 +1,10 @@
 #!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/files/3.6/samba.initd,v 1.3 2011/09/14 22:52:33 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/files/3.6/samba.initd,v 1.4 2014/03/14 09:30:41 polynomial-c Exp $
 
 extra_started_commands="reload"
+piddir="/var/run/samba"
 
 depend() {
 	after slapd
@@ -34,7 +35,7 @@ signal_do() {
 }
 
 mkdir_sambadirs() {
-	[ -d /var/run/samba ] || mkdir -p /var/run/samba
+	[ -d "${piddir}" ] || mkdir -p ${piddir}
 }
 
 start() {
diff --git a/net-fs/samba/samba-3.6.19.ebuild b/net-fs/samba/samba-3.6.19.ebuild
deleted file mode 100644
index 1d16729b062b..000000000000
--- a/net-fs/samba/samba-3.6.19.ebuild
+++ /dev/null
@@ -1,465 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.6.19.ebuild,v 1.14 2013/11/15 23:56:41 zerochaos Exp $
-
-EAPI=4
-
-inherit pam versionator multilib eutils flag-o-matic systemd
-
-MY_PV=${PV/_/}
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Library bits of the samba network filesystem"
-HOMEPAGE="http://www.samba.org/"
-SRC_URI="mirror://samba/stable/${MY_P}.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
-IUSE="acl addns ads +aio avahi caps +client cluster cups debug dmapi doc examples fam
-	ldap ldb +netapi pam quota +readline selinux +server +smbclient smbsharemodes
-	swat syslog +winbind"
-
-DEPEND="dev-libs/popt
-	>=sys-libs/talloc-2.0.5
-	>=sys-libs/tdb-1.2.9
-	>=sys-libs/tevent-0.9.18
-	virtual/libiconv
-	ads? ( virtual/krb5 sys-fs/e2fsprogs
-		client? ( sys-apps/keyutils ) )
-	avahi? ( net-dns/avahi[dbus] )
-	caps? ( sys-libs/libcap )
-	client? ( !net-fs/mount-cifs
-		dev-libs/iniparser )
-	cluster? ( >=dev-db/ctdb-1.13 )
-	cups? ( net-print/cups )
-	debug? ( dev-libs/dmalloc )
-	dmapi? ( sys-apps/dmapi )
-	fam? ( virtual/fam )
-	ldap? ( net-nds/openldap )
-	ldb? ( sys-libs/ldb )
-	pam? ( virtual/pam
-		winbind? ( dev-libs/iniparser )
-	)
-	readline? ( >=sys-libs/readline-5.2 )
-	selinux? ( sec-policy/selinux-samba )
-	syslog? ( virtual/logger )"
-
-RDEPEND="${DEPEND}
-	kernel_linux? ( ads? ( net-fs/cifs-utils[ads] )
-			client? ( net-fs/cifs-utils ) )"
-
-# Disable tests since we don't want to build that much here
-RESTRICT="test"
-
-SBINPROGS=""
-BINPROGS=""
-KRBPLUGIN=""
-PLUGINEXT=".so"
-SHAREDMODS=""
-
-S="${WORKDIR}/${MY_P}/source3"
-
-# TODO:
-# - enable iPrint on Prefix/OSX and Darwin?
-# - selftest-prefix? selftest?
-# - AFS?
-
-CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
-
-REQUIRED_USE="
-	ads? ( ldap )
-	swat? ( server )
-"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		if use winbind &&
-			[[ $(tc-getCC)$ == *gcc* ]] &&
-			[[ $(gcc-major-version)$(gcc-minor-version) -lt 43 ]]
-		then
-			eerror "It is a known issue that ${P} will not build with "
-			eerror "winbind use flag enabled when using gcc < 4.3 ."
-			eerror "Please use at least the latest stable gcc version."
-			die "Using sys-devel/gcc < 4.3 with winbind use flag."
-		fi
-	fi
-}
-
-pkg_setup() {
-	if use server ; then
-		SBINPROGS="${SBINPROGS} bin/smbd bin/nmbd"
-		BINPROGS="${BINPROGS} bin/testparm bin/smbstatus bin/smbcontrol bin/pdbedit
-			bin/profiles bin/sharesec bin/eventlogadm bin/smbta-util"
-
-		use swat && SBINPROGS="${SBINPROGS} bin/swat"
-		use winbind && SBINPROGS="${SBINPROGS} bin/winbindd"
-		use ads && use winbind && KRBPLUGIN="${KRBPLUGIN} bin/winbind_krb5_locator"
-	fi
-
-	if use client ; then
-		BINPROGS="${BINPROGS} bin/smbclient bin/net bin/smbget bin/smbtree
-			bin/nmblookup bin/smbpasswd bin/rpcclient bin/smbcacls bin/smbcquotas
-			bin/ntlm_auth"
-
-	fi
-
-	use cups && BINPROGS="${BINPROGS} bin/smbspool"
-#	use ldb && BINPROGS="${BINPROGS} bin/ldbedit bin/ldbsearch bin/ldbadd bin/ldbdel bin/ldbmodify bin/ldbrename";
-
-	if use winbind ; then
-		BINPROGS="${BINPROGS} bin/wbinfo"
-		SHAREDMODS="${SHAREDMODS}idmap_rid,idmap_hash"
-		use ads && SHAREDMODS="${SHAREDMODS},idmap_ad"
-		use cluster && SHAREDMODS="${SHAREDMODS},idmap_tdb2"
-		use ldap && SHAREDMODS="${SHAREDMODS},idmap_ldap,idmap_adex"
-	fi
-}
-
-src_prepare() {
-	cp "${FILESDIR}/samba-3.4.2-lib.tevent.python.mk" "../lib/tevent/python.mk"
-
-	# ensure that winbind has correct ldflags (QA notice)
-	sed -i \
-		-e 's|LDSHFLAGS="|LDSHFLAGS="\\${LDFLAGS} |g' \
-		configure || die "sed failed"
-	cd "${WORKDIR}/${MY_P}" && epatch "${CONFDIR}"/smb.conf.default.patch
-}
-
-src_configure() {
-	local myconf
-
-	# Filter out -fPIE
-	[[ ${CHOST} == *-*bsd* ]] && myconf+=" --disable-pie"
-
-	#Allowing alpha/s390/sh to build
-	if use alpha || use s390 || use sh ; then
-		replace-flags -O? -O1
-	fi
-
-	# http://wiki.samba.org/index.php/CTDB_Setup
-	use cluster && myconf+=" --disable-pie"
-
-	# Upstream refuses to make this configurable
-	use caps && export ac_cv_header_sys_capability_h=yes || export ac_cv_header_sys_capability_h=no
-
-	#bug #399141 wrap newer iniparser version
-	has_version ">=dev-libs/iniparser-3.0.0" && \
-		export CPPFLAGS+=" -Diniparser_getstr\(d,i\)=iniparser_getstring\(d,i,NULL\)"
-
-	# Notes:
-	# - automount is only needed in conjunction with NIS and we don't have that
-	# anymore => LDAP?
-	# - --without-dce-dfs and --without-nisplus-home can't be passed to configure but are disabled by default
-	econf ${myconf} \
-		--with-piddir="${EPREFIX}"/var/run/samba \
-		--sysconfdir="${EPREFIX}"/etc/samba \
-		--localstatedir="${EPREFIX}"/var \
-		$(use_enable debug developer) \
-		--enable-largefile \
-		--enable-socket-wrapper \
-		--enable-nss-wrapper \
-		$(use_enable swat) \
-		$(use_enable debug dmalloc) \
-		$(use_enable cups) \
-		--disable-iprint \
-		$(use_enable fam) \
-		--enable-shared-libs \
-		--disable-dnssd \
-		$(use_enable avahi) \
-		--with-fhs \
-		--with-privatedir="${EPREFIX}"/var/lib/samba/private \
-		--with-rootsbindir="${EPREFIX}"/var/cache/samba \
-		--with-lockdir="${EPREFIX}"/var/cache/samba \
-		--with-swatdir="${EPREFIX}"/usr/share/doc/${PF}/swat \
-		--with-configdir="${EPREFIX}"/etc/samba \
-		--with-logfilebase="${EPREFIX}"/var/log/samba \
-		--with-pammodulesdir=$(getpam_mod_dir) \
-		$(use_with dmapi) \
-		--without-afs \
-		--without-fake-kaserver \
-		--without-vfs-afsacl \
-		$(use_with ldap) \
-		$(use_with ads) \
-		$(use_with ads krb5 "${EPREFIX}"/usr) \
-		$(use_with ads dnsupdate) \
-		--without-automount \
-		$(use_with pam) \
-		$(use_with pam pam_smbpass) \
-		$(use_with syslog) \
-		$(use_with quota quotas) \
-		$(use_with quota sys-quotas) \
-		--without-utmp \
-		--without-lib{talloc,tdb} \
-		$(use_with netapi libnetapi) \
-		$(use_with smbclient libsmbclient) \
-		$(use_with smbsharemodes libsmbsharemodes) \
-		$(use_with addns libaddns) \
-		$(use_with cluster ctdb "${EPREFIX}"/usr) \
-		$(use_with cluster cluster-support) \
-		$(use_with acl acl-support) \
-		$(use_with aio aio-support) \
-		--with-sendfile-support \
-		$(use_with winbind) \
-		--with-shared-modules=${SHAREDMODS} \
-		--without-included-popt \
-		--without-included-iniparser
-}
-
-src_compile() {
-	# compile libs
-	if use addns ; then
-		einfo "make addns library"
-		emake libaddns
-	fi
-	if use netapi ; then
-		einfo "make netapi library"
-		emake libnetapi
-	fi
-	if use smbclient ; then
-		einfo "make smbclient library"
-		emake libsmbclient
-	fi
-	if use smbsharemodes ; then
-		einfo "make smbsharemodes library"
-		emake libsmbsharemodes
-	fi
-
-	# compile modules
-	emake modules
-
-	# compile pam moudles
-	if use pam ; then
-		einfo "make pam modules"
-		emake pam_modules
-	fi
-
-	# compile winbind nss modules
-	if use winbind ; then
-		einfo "make nss modules"
-		emake nss_modules
-	fi
-
-	# compile utilities
-	if [ -n "${BINPROGS}" ] ; then
-		einfo "make binprogs"
-		emake ${BINPROGS}
-	fi
-	if [ -n "${SBINPROGS}" ] ; then
-		einfo "make sbinprogs"
-		emake ${SBINPROGS}
-	fi
-
-	if [ -n "${KRBPLUGIN}" ] ; then
-		einfo "make krbplugin"
-		emake ${KRBPLUGIN}${PLUGINEXT}
-	fi
-
-}
-
-src_install() {
-	# pkgconfig files installation needed, bug #464818
-	local pkgconfigdir=/usr/$(get_libdir)/pkgconfig
-
-	# install libs
-	if use addns ; then
-		einfo "install addns library"
-		emake installlibaddns DESTDIR="${D}"
-	fi
-	if use netapi ; then
-		einfo "install netapi library"
-		emake installlibnetapi DESTDIR="${D}"
-		insinto $pkgconfigdir
-		doins pkgconfig/netapi.pc
-	fi
-	if use smbclient ; then
-		einfo "install smbclient library"
-		emake installlibsmbclient DESTDIR="${D}"
-		insinto $pkgconfigdir
-		doins pkgconfig/smbclient.pc
-	fi
-	if use smbsharemodes ; then
-		einfo "install smbsharemodes library"
-		emake installlibsmbsharemodes DESTDIR="${D}"
-		insinto $pkgconfigdir
-		doins pkgconfig/smbsharemodes.pc
-	fi
-
-	# install modules
-	emake installmodules DESTDIR="${D}"
-
-	if use pam ; then
-		einfo "install pam modules"
-		emake installpammodules DESTDIR="${D}"
-
-		if use winbind ; then
-			newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
-			doman ../docs/manpages/pam_winbind.8
-			# bug #376853
-			insinto /etc/security
-			doins ../examples/pam_winbind/pam_winbind.conf || die
-		fi
-
-		newpamd "${CONFDIR}/samba.pam" samba
-		dodoc pam_smbpass/README
-	fi
-
-	# Nsswitch extensions. Make link for wins and winbind resolvers
-	if use winbind ; then
-		einfo "install libwbclient"
-		emake installlibwbclient DESTDIR="${D}"
-		dolib.so ../nsswitch/libnss_wins.so
-		dosym libnss_wins.so /usr/$(get_libdir)/libnss_wins.so.2
-		dolib.so ../nsswitch/libnss_winbind.so
-		dosym libnss_winbind.so /usr/$(get_libdir)/libnss_winbind.so.2
-		insinto $pkgconfigdir
-		doins pkgconfig/wbclient.pc
-		einfo "install libwbclient related manpages"
-		doman ../docs/manpages/idmap_rid.8
-		doman ../docs/manpages/idmap_hash.8
-		if use ldap ; then
-			doman ../docs/manpages/idmap_adex.8
-			doman ../docs/manpages/idmap_ldap.8
-		fi
-		if use ads ; then
-			doman ../docs/manpages/idmap_ad.8
-		fi
-	fi
-
-	# install binaries
-	insinto /usr
-	for prog in ${SBINPROGS} ; do
-		dosbin ${prog}
-		doman ../docs/manpages/${prog/bin\/}*
-	done
-
-	for prog in ${BINPROGS} ; do
-		dobin ${prog}
-		doman ../docs/manpages/${prog/bin\/}*
-	done
-
-	# install scripts
-	if use client ; then
-		dobin script/findsmb
-		doman ../docs/manpages/findsmb.1
-	fi
-
-	# install krbplugin
-	if [ -n "${KRBPLUGIN}" ] ; then
-		if has_version app-crypt/mit-krb5 ; then
-			insinto /usr/$(get_libdir)/krb5/plugins/libkrb5
-			doins ${KRBPLUGIN}${PLUGINEXT}
-		elif has_version app-crypt/heimdal ; then
-			insinto /usr/$(get_libdir)/plugin/krb5
-			doins ${KRBPLUGIN}${PLUGINEXT}
-		fi
-		insinto /usr
-		for prog in ${KRBPLUGIN} ; do
-			doman ../docs/manpages/${prog/bin\/}*
-		done
-	fi
-
-	# install server components
-	if use server ; then
-		doman ../docs/manpages/vfs* ../docs/manpages/samba.7
-
-		diropts -m0700
-		keepdir /var/lib/samba/private
-
-		diropts -m1777
-		keepdir /var/spool/samba
-
-		diropts -m0755
-		keepdir /var/{cache,log}/samba
-		keepdir /var/lib/samba/{netlogon,profiles}
-		keepdir /var/lib/samba/printers/{W32X86,WIN40,W32ALPHA,W32MIPS,W32PPC,X64,IA64,COLOR}
-		keepdir /usr/$(get_libdir)/samba/{auth,pdb,rpc,idmap,nss_info,gpext}
-
-		newconfd "${CONFDIR}/samba.confd" samba
-		newinitd "${CONFDIR}/samba.initd" samba
-
-		insinto /etc/samba
-		doins "${CONFDIR}"/{smbusers,lmhosts}
-
-		if use ldap ; then
-			insinto /etc/openldap/schema
-			doins ../examples/LDAP/samba.schema
-		fi
-
-		if use swat ; then
-			insinto /etc/xinetd.d
-			newins "${CONFDIR}/swat.xinetd" swat
-			script/installswat.sh "${ED}" "${EROOT}/usr/share/doc/${PF}/swat" "${S}"
-		fi
-
-		dodoc ../MAINTAINERS.txt ../README* ../Roadmap ../WHATSNEW.txt ../docs/THANKS
-	fi
-
-	# install the spooler to cups
-	if use cups ; then
-		dosym /usr/bin/smbspool $(cups-config --serverbin)/backend/smb
-	fi
-
-	# install misc files
-	insinto /etc/samba
-	doins ../examples/smb.conf.default
-	doman  ../docs/manpages/smb.conf.5
-
-	insinto /usr/"$(get_libdir)"/samba
-	doins ../codepages/{valid.dat,upcase.dat,lowcase.dat}
-
-	# install docs
-	if use doc ; then
-		dohtml -r ../docs/htmldocs/*
-		dodoc ../docs/*.pdf
-	fi
-
-	# install examples
-	if use examples ; then
-		insinto /usr/share/doc/${PF}/examples
-
-		if use smbclient ; then
-			doins -r ../examples/libsmbclient
-		fi
-
-		if use winbind ; then
-			doins -r ../examples/pam_winbind ../examples/nss
-		fi
-
-		if use server ; then
-			cd ../examples
-			doins -r auth autofs dce-dfs LDAP logon misc pdb \
-			perfcounter printer-accounting printing scripts tridge \
-			validchars VFS
-		fi
-	fi
-
-	# Remove empty installation directories
-	rmdir --ignore-fail-on-non-empty \
-		"${ED}/usr/$(get_libdir)/samba" \
-		"${ED}/usr"/{sbin,bin} \
-		"${ED}/usr/share"/{man,locale,} \
-		"${ED}/var"/{run,lib/samba/private,lib/samba,lib,cache/samba,cache,} \
-	#	|| die "tried to remove non-empty dirs, this seems like a bug in the ebuild"
-
-	systemd_dotmpfilesd "${FILESDIR}"/samba.conf
-	systemd_dounit "${FILESDIR}"/nmbd.service
-	systemd_dounit "${FILESDIR}"/smbd.{service,socket}
-	systemd_newunit "${FILESDIR}"/smbd_at.service 'smbd@.service'
-	systemd_dounit "${FILESDIR}"/winbindd.service
-}
-
-pkg_postinst() {
-	elog "Samba 3.6 has adopted a number of improved security defaults that"
-	elog "will impact on existing users of Samba."
-	elog "			client ntlmv2 auth = yes"
-	elog "			client use spnego principal = no"
-	elog "			send spnego principal = no"
-	elog ""
-	elog "SMB2 protocol support in 3.6.0 is fully functional and can be "
-	elog "enabled by setting 'max protocol = smb2'. SMB2 is a new "
-	elog "implementation of the SMB protocol used by Windows Vista and higher"
-	elog ""
-	elog "For further information make sure to read the release notes at"
-	elog "http://samba.org/samba/history/${P}.html and "
-	elog "http://samba.org/samba/history/${PN}-3.6.0.html"
-}
diff --git a/net-fs/samba/samba-3.6.20.ebuild b/net-fs/samba/samba-3.6.20.ebuild
deleted file mode 100644
index fe72eca2127d..000000000000
--- a/net-fs/samba/samba-3.6.20.ebuild
+++ /dev/null
@@ -1,465 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.6.20.ebuild,v 1.11 2013/12/08 17:05:48 ago Exp $
-
-EAPI=4
-
-inherit pam versionator multilib eutils flag-o-matic systemd
-
-MY_PV=${PV/_/}
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Library bits of the samba network filesystem"
-HOMEPAGE="http://www.samba.org/"
-SRC_URI="mirror://samba/stable/${MY_P}.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
-IUSE="acl addns ads +aio avahi caps +client cluster cups debug dmapi doc examples fam
-	ldap ldb +netapi pam quota +readline selinux +server +smbclient smbsharemodes
-	swat syslog +winbind"
-
-DEPEND="dev-libs/popt
-	>=sys-libs/talloc-2.0.5
-	>=sys-libs/tdb-1.2.9
-	>=sys-libs/tevent-0.9.18
-	virtual/libiconv
-	ads? ( virtual/krb5 sys-fs/e2fsprogs
-		client? ( sys-apps/keyutils ) )
-	avahi? ( net-dns/avahi[dbus] )
-	caps? ( sys-libs/libcap )
-	client? ( !net-fs/mount-cifs
-		dev-libs/iniparser )
-	cluster? ( >=dev-db/ctdb-1.13 )
-	cups? ( net-print/cups )
-	debug? ( dev-libs/dmalloc )
-	dmapi? ( sys-apps/dmapi )
-	fam? ( virtual/fam )
-	ldap? ( net-nds/openldap )
-	ldb? ( sys-libs/ldb )
-	pam? ( virtual/pam
-		winbind? ( dev-libs/iniparser )
-	)
-	readline? ( >=sys-libs/readline-5.2 )
-	selinux? ( sec-policy/selinux-samba )
-	syslog? ( virtual/logger )"
-
-RDEPEND="${DEPEND}
-	kernel_linux? ( ads? ( net-fs/cifs-utils[ads] )
-			client? ( net-fs/cifs-utils ) )"
-
-# Disable tests since we don't want to build that much here
-RESTRICT="test"
-
-SBINPROGS=""
-BINPROGS=""
-KRBPLUGIN=""
-PLUGINEXT=".so"
-SHAREDMODS=""
-
-S="${WORKDIR}/${MY_P}/source3"
-
-# TODO:
-# - enable iPrint on Prefix/OSX and Darwin?
-# - selftest-prefix? selftest?
-# - AFS?
-
-CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
-
-REQUIRED_USE="
-	ads? ( ldap )
-	swat? ( server )
-"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		if use winbind &&
-			[[ $(tc-getCC)$ == *gcc* ]] &&
-			[[ $(gcc-major-version)$(gcc-minor-version) -lt 43 ]]
-		then
-			eerror "It is a known issue that ${P} will not build with "
-			eerror "winbind use flag enabled when using gcc < 4.3 ."
-			eerror "Please use at least the latest stable gcc version."
-			die "Using sys-devel/gcc < 4.3 with winbind use flag."
-		fi
-	fi
-}
-
-pkg_setup() {
-	if use server ; then
-		SBINPROGS="${SBINPROGS} bin/smbd bin/nmbd"
-		BINPROGS="${BINPROGS} bin/testparm bin/smbstatus bin/smbcontrol bin/pdbedit
-			bin/profiles bin/sharesec bin/eventlogadm bin/smbta-util"
-
-		use swat && SBINPROGS="${SBINPROGS} bin/swat"
-		use winbind && SBINPROGS="${SBINPROGS} bin/winbindd"
-		use ads && use winbind && KRBPLUGIN="${KRBPLUGIN} bin/winbind_krb5_locator"
-	fi
-
-	if use client ; then
-		BINPROGS="${BINPROGS} bin/smbclient bin/net bin/smbget bin/smbtree
-			bin/nmblookup bin/smbpasswd bin/rpcclient bin/smbcacls bin/smbcquotas
-			bin/ntlm_auth"
-
-	fi
-
-	use cups && BINPROGS="${BINPROGS} bin/smbspool"
-#	use ldb && BINPROGS="${BINPROGS} bin/ldbedit bin/ldbsearch bin/ldbadd bin/ldbdel bin/ldbmodify bin/ldbrename";
-
-	if use winbind ; then
-		BINPROGS="${BINPROGS} bin/wbinfo"
-		SHAREDMODS="${SHAREDMODS}idmap_rid,idmap_hash"
-		use ads && SHAREDMODS="${SHAREDMODS},idmap_ad"
-		use cluster && SHAREDMODS="${SHAREDMODS},idmap_tdb2"
-		use ldap && SHAREDMODS="${SHAREDMODS},idmap_ldap,idmap_adex"
-	fi
-}
-
-src_prepare() {
-	cp "${FILESDIR}/samba-3.4.2-lib.tevent.python.mk" "../lib/tevent/python.mk"
-
-	# ensure that winbind has correct ldflags (QA notice)
-	sed -i \
-		-e 's|LDSHFLAGS="|LDSHFLAGS="\\${LDFLAGS} |g' \
-		configure || die "sed failed"
-	cd "${WORKDIR}/${MY_P}" && epatch "${CONFDIR}"/smb.conf.default.patch
-}
-
-src_configure() {
-	local myconf
-
-	# Filter out -fPIE
-	[[ ${CHOST} == *-*bsd* ]] && myconf+=" --disable-pie"
-
-	#Allowing alpha/s390/sh to build
-	if use alpha || use s390 || use sh ; then
-		replace-flags -O? -O1
-	fi
-
-	# http://wiki.samba.org/index.php/CTDB_Setup
-	use cluster && myconf+=" --disable-pie"
-
-	# Upstream refuses to make this configurable
-	use caps && export ac_cv_header_sys_capability_h=yes || export ac_cv_header_sys_capability_h=no
-
-	#bug #399141 wrap newer iniparser version
-	has_version ">=dev-libs/iniparser-3.0.0" && \
-		export CPPFLAGS+=" -Diniparser_getstr\(d,i\)=iniparser_getstring\(d,i,NULL\)"
-
-	# Notes:
-	# - automount is only needed in conjunction with NIS and we don't have that
-	# anymore => LDAP?
-	# - --without-dce-dfs and --without-nisplus-home can't be passed to configure but are disabled by default
-	econf ${myconf} \
-		--with-piddir="${EPREFIX}"/var/run/samba \
-		--sysconfdir="${EPREFIX}"/etc/samba \
-		--localstatedir="${EPREFIX}"/var \
-		$(use_enable debug developer) \
-		--enable-largefile \
-		--enable-socket-wrapper \
-		--enable-nss-wrapper \
-		$(use_enable swat) \
-		$(use_enable debug dmalloc) \
-		$(use_enable cups) \
-		--disable-iprint \
-		$(use_enable fam) \
-		--enable-shared-libs \
-		--disable-dnssd \
-		$(use_enable avahi) \
-		--with-fhs \
-		--with-privatedir="${EPREFIX}"/var/lib/samba/private \
-		--with-rootsbindir="${EPREFIX}"/var/cache/samba \
-		--with-lockdir="${EPREFIX}"/var/cache/samba \
-		--with-swatdir="${EPREFIX}"/usr/share/doc/${PF}/swat \
-		--with-configdir="${EPREFIX}"/etc/samba \
-		--with-logfilebase="${EPREFIX}"/var/log/samba \
-		--with-pammodulesdir=$(getpam_mod_dir) \
-		$(use_with dmapi) \
-		--without-afs \
-		--without-fake-kaserver \
-		--without-vfs-afsacl \
-		$(use_with ldap) \
-		$(use_with ads) \
-		$(use_with ads krb5 "${EPREFIX}"/usr) \
-		$(use_with ads dnsupdate) \
-		--without-automount \
-		$(use_with pam) \
-		$(use_with pam pam_smbpass) \
-		$(use_with syslog) \
-		$(use_with quota quotas) \
-		$(use_with quota sys-quotas) \
-		--without-utmp \
-		--without-lib{talloc,tdb} \
-		$(use_with netapi libnetapi) \
-		$(use_with smbclient libsmbclient) \
-		$(use_with smbsharemodes libsmbsharemodes) \
-		$(use_with addns libaddns) \
-		$(use_with cluster ctdb "${EPREFIX}"/usr) \
-		$(use_with cluster cluster-support) \
-		$(use_with acl acl-support) \
-		$(use_with aio aio-support) \
-		--with-sendfile-support \
-		$(use_with winbind) \
-		--with-shared-modules=${SHAREDMODS} \
-		--without-included-popt \
-		--without-included-iniparser
-}
-
-src_compile() {
-	# compile libs
-	if use addns ; then
-		einfo "make addns library"
-		emake libaddns
-	fi
-	if use netapi ; then
-		einfo "make netapi library"
-		emake libnetapi
-	fi
-	if use smbclient ; then
-		einfo "make smbclient library"
-		emake libsmbclient
-	fi
-	if use smbsharemodes ; then
-		einfo "make smbsharemodes library"
-		emake libsmbsharemodes
-	fi
-
-	# compile modules
-	emake modules
-
-	# compile pam moudles
-	if use pam ; then
-		einfo "make pam modules"
-		emake pam_modules
-	fi
-
-	# compile winbind nss modules
-	if use winbind ; then
-		einfo "make nss modules"
-		emake nss_modules
-	fi
-
-	# compile utilities
-	if [ -n "${BINPROGS}" ] ; then
-		einfo "make binprogs"
-		emake ${BINPROGS}
-	fi
-	if [ -n "${SBINPROGS}" ] ; then
-		einfo "make sbinprogs"
-		emake ${SBINPROGS}
-	fi
-
-	if [ -n "${KRBPLUGIN}" ] ; then
-		einfo "make krbplugin"
-		emake ${KRBPLUGIN}${PLUGINEXT}
-	fi
-
-}
-
-src_install() {
-	# pkgconfig files installation needed, bug #464818
-	local pkgconfigdir=/usr/$(get_libdir)/pkgconfig
-
-	# install libs
-	if use addns ; then
-		einfo "install addns library"
-		emake installlibaddns DESTDIR="${D}"
-	fi
-	if use netapi ; then
-		einfo "install netapi library"
-		emake installlibnetapi DESTDIR="${D}"
-		insinto $pkgconfigdir
-		doins pkgconfig/netapi.pc
-	fi
-	if use smbclient ; then
-		einfo "install smbclient library"
-		emake installlibsmbclient DESTDIR="${D}"
-		insinto $pkgconfigdir
-		doins pkgconfig/smbclient.pc
-	fi
-	if use smbsharemodes ; then
-		einfo "install smbsharemodes library"
-		emake installlibsmbsharemodes DESTDIR="${D}"
-		insinto $pkgconfigdir
-		doins pkgconfig/smbsharemodes.pc
-	fi
-
-	# install modules
-	emake installmodules DESTDIR="${D}"
-
-	if use pam ; then
-		einfo "install pam modules"
-		emake installpammodules DESTDIR="${D}"
-
-		if use winbind ; then
-			newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
-			doman ../docs/manpages/pam_winbind.8
-			# bug #376853
-			insinto /etc/security
-			doins ../examples/pam_winbind/pam_winbind.conf || die
-		fi
-
-		newpamd "${CONFDIR}/samba.pam" samba
-		dodoc pam_smbpass/README
-	fi
-
-	# Nsswitch extensions. Make link for wins and winbind resolvers
-	if use winbind ; then
-		einfo "install libwbclient"
-		emake installlibwbclient DESTDIR="${D}"
-		dolib.so ../nsswitch/libnss_wins.so
-		dosym libnss_wins.so /usr/$(get_libdir)/libnss_wins.so.2
-		dolib.so ../nsswitch/libnss_winbind.so
-		dosym libnss_winbind.so /usr/$(get_libdir)/libnss_winbind.so.2
-		insinto $pkgconfigdir
-		doins pkgconfig/wbclient.pc
-		einfo "install libwbclient related manpages"
-		doman ../docs/manpages/idmap_rid.8
-		doman ../docs/manpages/idmap_hash.8
-		if use ldap ; then
-			doman ../docs/manpages/idmap_adex.8
-			doman ../docs/manpages/idmap_ldap.8
-		fi
-		if use ads ; then
-			doman ../docs/manpages/idmap_ad.8
-		fi
-	fi
-
-	# install binaries
-	insinto /usr
-	for prog in ${SBINPROGS} ; do
-		dosbin ${prog}
-		doman ../docs/manpages/${prog/bin\/}*
-	done
-
-	for prog in ${BINPROGS} ; do
-		dobin ${prog}
-		doman ../docs/manpages/${prog/bin\/}*
-	done
-
-	# install scripts
-	if use client ; then
-		dobin script/findsmb
-		doman ../docs/manpages/findsmb.1
-	fi
-
-	# install krbplugin
-	if [ -n "${KRBPLUGIN}" ] ; then
-		if has_version app-crypt/mit-krb5 ; then
-			insinto /usr/$(get_libdir)/krb5/plugins/libkrb5
-			doins ${KRBPLUGIN}${PLUGINEXT}
-		elif has_version app-crypt/heimdal ; then
-			insinto /usr/$(get_libdir)/plugin/krb5
-			doins ${KRBPLUGIN}${PLUGINEXT}
-		fi
-		insinto /usr
-		for prog in ${KRBPLUGIN} ; do
-			doman ../docs/manpages/${prog/bin\/}*
-		done
-	fi
-
-	# install server components
-	if use server ; then
-		doman ../docs/manpages/vfs* ../docs/manpages/samba.7
-
-		diropts -m0700
-		keepdir /var/lib/samba/private
-
-		diropts -m1777
-		keepdir /var/spool/samba
-
-		diropts -m0755
-		keepdir /var/{cache,log}/samba
-		keepdir /var/lib/samba/{netlogon,profiles}
-		keepdir /var/lib/samba/printers/{W32X86,WIN40,W32ALPHA,W32MIPS,W32PPC,X64,IA64,COLOR}
-		keepdir /usr/$(get_libdir)/samba/{auth,pdb,rpc,idmap,nss_info,gpext}
-
-		newconfd "${CONFDIR}/samba.confd" samba
-		newinitd "${CONFDIR}/samba.initd" samba
-
-		insinto /etc/samba
-		doins "${CONFDIR}"/{smbusers,lmhosts}
-
-		if use ldap ; then
-			insinto /etc/openldap/schema
-			doins ../examples/LDAP/samba.schema
-		fi
-
-		if use swat ; then
-			insinto /etc/xinetd.d
-			newins "${CONFDIR}/swat.xinetd" swat
-			script/installswat.sh "${ED}" "${EROOT}/usr/share/doc/${PF}/swat" "${S}"
-		fi
-
-		dodoc ../MAINTAINERS.txt ../README* ../Roadmap ../WHATSNEW.txt ../docs/THANKS
-	fi
-
-	# install the spooler to cups
-	if use cups ; then
-		dosym /usr/bin/smbspool $(cups-config --serverbin)/backend/smb
-	fi
-
-	# install misc files
-	insinto /etc/samba
-	doins ../examples/smb.conf.default
-	doman  ../docs/manpages/smb.conf.5
-
-	insinto /usr/"$(get_libdir)"/samba
-	doins ../codepages/{valid.dat,upcase.dat,lowcase.dat}
-
-	# install docs
-	if use doc ; then
-		dohtml -r ../docs/htmldocs/*
-		dodoc ../docs/*.pdf
-	fi
-
-	# install examples
-	if use examples ; then
-		insinto /usr/share/doc/${PF}/examples
-
-		if use smbclient ; then
-			doins -r ../examples/libsmbclient
-		fi
-
-		if use winbind ; then
-			doins -r ../examples/pam_winbind ../examples/nss
-		fi
-
-		if use server ; then
-			cd ../examples
-			doins -r auth autofs dce-dfs LDAP logon misc pdb \
-			perfcounter printer-accounting printing scripts tridge \
-			validchars VFS
-		fi
-	fi
-
-	# Remove empty installation directories
-	rmdir --ignore-fail-on-non-empty \
-		"${ED}/usr/$(get_libdir)/samba" \
-		"${ED}/usr"/{sbin,bin} \
-		"${ED}/usr/share"/{man,locale,} \
-		"${ED}/var"/{run,lib/samba/private,lib/samba,lib,cache/samba,cache,} \
-	#	|| die "tried to remove non-empty dirs, this seems like a bug in the ebuild"
-
-	systemd_dotmpfilesd "${FILESDIR}"/samba.conf
-	systemd_dounit "${FILESDIR}"/nmbd.service
-	systemd_dounit "${FILESDIR}"/smbd.{service,socket}
-	systemd_newunit "${FILESDIR}"/smbd_at.service 'smbd@.service'
-	systemd_dounit "${FILESDIR}"/winbindd.service
-}
-
-pkg_postinst() {
-	elog "Samba 3.6 has adopted a number of improved security defaults that"
-	elog "will impact on existing users of Samba."
-	elog "			client ntlmv2 auth = yes"
-	elog "			client use spnego principal = no"
-	elog "			send spnego principal = no"
-	elog ""
-	elog "SMB2 protocol support in 3.6.0 is fully functional and can be "
-	elog "enabled by setting 'max protocol = smb2'. SMB2 is a new "
-	elog "implementation of the SMB protocol used by Windows Vista and higher"
-	elog ""
-	elog "For further information make sure to read the release notes at"
-	elog "http://samba.org/samba/history/${P}.html and "
-	elog "http://samba.org/samba/history/${PN}-3.6.0.html"
-}
diff --git a/net-fs/samba/samba-3.6.21.ebuild b/net-fs/samba/samba-3.6.23.ebuild
index cf6f9495b2f1..4d5da3deb7d4 100644
--- a/net-fs/samba/samba-3.6.21.ebuild
+++ b/net-fs/samba/samba-3.6.23.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.6.21.ebuild,v 1.1 2013/11/30 20:03:47 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.6.23.ebuild,v 1.1 2014/03/14 09:30:41 polynomial-c Exp $
 
 EAPI=4
 
diff --git a/net-fs/samba/samba-4.0.15-r1.ebuild b/net-fs/samba/samba-4.0.16.ebuild
index ac9f5d0e380b..e53d4d63bb62 100644
--- a/net-fs/samba/samba-4.0.15-r1.ebuild
+++ b/net-fs/samba/samba-4.0.16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.0.15-r1.ebuild,v 1.2 2014/03/13 15:35:07 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.0.16.ebuild,v 1.1 2014/03/14 09:30:41 polynomial-c Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_{6,7} )
diff --git a/net-fs/samba/samba-4.1.5-r1.ebuild b/net-fs/samba/samba-4.1.6.ebuild
index 1cb469856297..cbc3dbc85105 100644
--- a/net-fs/samba/samba-4.1.5-r1.ebuild
+++ b/net-fs/samba/samba-4.1.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.1.5-r1.ebuild,v 1.2 2014/03/13 15:35:07 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.1.6.ebuild,v 1.1 2014/03/14 09:30:41 polynomial-c Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_{6,7} )