Version bump: fixes building with cups-1.6.x (bug #428490), added dmapi USE flag (bug #425166), enable idmap_tdb2 with USE=cluster (bug #418331).

Package-Manager: portage-2.1.11.9/cvs/Linux x86_64

4 files changed, 504 insertions, 43 deletions

diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog
index 1a400bbc06e9..1fcd623ea15c 100644
--- a/net-fs/samba/ChangeLog
+++ b/net-fs/samba/ChangeLog
@@ -1,6 +1,13 @@
 # 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.520 2012/07/03 05:29:05 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.521 2012/08/10 07:24:10 dev-zero Exp $
+
+*samba-3.6.7 (10 Aug 2012)
+
+  10 Aug 2012; Tiziano Müller <dev-zero@gentoo.org> +samba-3.6.7.ebuild,
+  metadata.xml:
+  Version bump: fixes building with cups-1.6.x (bug #428490), added dmapi USE
+  flag (bug #425166), enable idmap_tdb2 with USE=cluster (bug #418331).
 
 *samba-3.6.6 (03 Jul 2012)
 *samba-3.5.16 (03 Jul 2012)
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 6b839418dfd2..961c3e7b56de 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -1,42 +1,54 @@
-AUX 3.5/lmhosts 126 RMD160 485c480c5d3203e5f6c3d769ea36d04682a4ce39 SHA1 149e536986bddaf961d77e73f3bf04f39212333d SHA256 f959c6e6b4179de24b2268c13b7cd8a8e400e43d0852f91dfb8dc8e48f56f80e
-AUX 3.5/nsswitch.conf-winbind 406 RMD160 43175297fb2ca9e364a7e07e6b1f7cec367f36f5 SHA1 16c57e5ba8d07ecc50d0e1a93df5bc82c4063764 SHA256 c6d461204201143f874f460df35f7fbb2345f93ed0d6c20b280c15864011e893
-AUX 3.5/nsswitch.conf-wins 392 RMD160 58b135036c4a7ecab97bf532b35da3d50693c4bf SHA1 7945e42a4d72e4604678add14ecdbb9bde8e9894 SHA256 3dbd18dc82371ef6f427dea1f626ee027d9d7be86036e2e10991f52f7041b5c8
-AUX 3.5/samba-3.5.6-kerberos-dummy.patch 1660 RMD160 a1077508f2a6a7ec2c9fb14f563be1baacdee4ed SHA1 708299aefaa213269065328475e5580925ace548 SHA256 bcc2b4ad1a4ff92221b4620cb1cf2915db19c527fb28308db7ef633c0e1f596e
-AUX 3.5/samba-3.5.8-uclib-build.patch 1750 RMD160 88cfa51290324bc71d7c7d982928f55ec5e8b354 SHA1 47a21922c1f5d78b881026ebf91b0583eead6f56 SHA256 ec3d8a21fcc41a65b0dd6ae8312b3da0705628ea1002e9e79574c5e20cbe689b
-AUX 3.5/samba.confd 1210 RMD160 78ecc93c7481b7df2f63a237ae952ceb44373fd3 SHA1 01a725cfea8039bfab5de695984f089e48eb739b SHA256 02ab523d695b5ae044b871923ad817f8931a6c20c5bfefad98a4369d7b3742e3
-AUX 3.5/samba.initd 1250 RMD160 71a79bb60b18de1c49c59a7230b51425d66e507e SHA1 b8d0c630506bce813866c7547ad9540a55b962b0 SHA256 e14e32cfc6c76fcfc9894250d980800ab61f540162d6d57065f6616801965875
-AUX 3.5/samba.pam 397 RMD160 8f64b09e17e0c458a8156db3cc92a0413513e4fc SHA1 f39d48e07be8069885b51253c5b891a856b7b41e SHA256 86634f2d541370518d0958a73c04776ed5df2a3716ef128ff384459acce9cd38
-AUX 3.5/smb.conf.default 9660 RMD160 049024e0b489027a44e3ae7b03216ebba8a2d716 SHA1 00954aa58287ef49e9eb0f9f6a04dd509f8835f3 SHA256 8f4fc4d137a32f92b9bc1b64f76ea25a690881cf6f385b9ce9eb0c98f2b0b297
-AUX 3.5/smb.conf.default.patch 2873 RMD160 f0e7ae6a41959dacdf9f71a14e3c9477f07bbf1b SHA1 e1066dc4db5566d2b5accac4febf46e449866557 SHA256 b617b011fa8be51d1f6da18dcede5bf0fc96d50551028aa2b3a5521322b4c8c7
-AUX 3.5/smbusers 218 RMD160 a94e0928466c0ed7cfd3edd3ac88dd1c8725a987 SHA1 84518d8768048e497724c72f89c00e6223c6cdb6 SHA256 ed24f121813aff4b8e79c99317f4f9dfde9246d150d7718f0fa60babb8b9dca1
-AUX 3.5/swat.xinetd 527 RMD160 8b2364e6fda8cecc75feef8129347ebc545ecc43 SHA1 98f94bc638ffb68d6fb35745aebbf0c63d4135ce SHA256 7919926945c9a7a28446280ea477aed2d7d3506372a03cbea96b446a8fa39aa4
-AUX 3.5/system-auth-winbind.pam 705 RMD160 666533e99283449d60a97fd4fcd704d72212b871 SHA1 a1fe11d7a4f7501c938c03121e4ad950c515f75e SHA256 eca81593dc1b3e2be19bba7a128d71474243216a7783ed788320ca51cf6ea6c7
-AUX 3.6/lmhosts 125 RMD160 352d66c815ec164196bc9daf70b08b36d1447972 SHA1 ee122d2e006c8dc1e1f0a72db76bb6b3c326d849 SHA256 0bcbc9c3cfb44e31ccdc0930a1bcacc4e2b0fd96e5d38a56234a5133707a1826
-AUX 3.6/samba.confd 1210 RMD160 78ecc93c7481b7df2f63a237ae952ceb44373fd3 SHA1 01a725cfea8039bfab5de695984f089e48eb739b SHA256 02ab523d695b5ae044b871923ad817f8931a6c20c5bfefad98a4369d7b3742e3
-AUX 3.6/samba.initd 1250 RMD160 627dcdb6ec953481a19efc351492cf60e4e9aa15 SHA1 8901f4b8f4291ded1bb4ad7e1ede6767ac5e22ff SHA256 3eabeabbe203fcdcea37d53048bdbf7e6cfaaf795bef8b98ec37aa572e57d052
-AUX 3.6/samba.pam 397 RMD160 8f64b09e17e0c458a8156db3cc92a0413513e4fc SHA1 f39d48e07be8069885b51253c5b891a856b7b41e SHA256 86634f2d541370518d0958a73c04776ed5df2a3716ef128ff384459acce9cd38
-AUX 3.6/smb.conf.default.patch 2385 RMD160 807cc1e9d18e41d4f15fec2ef675bc8bbbdeab92 SHA1 d3244cf26702945fb686a0fbf75be8adc161f379 SHA256 2140436e553e5dfc0b472e3a09a597de61f15847f23e8f92b9f561a6b9164034
-AUX 3.6/smbusers 217 RMD160 3dd2a60bbaf206ad7343ea80509b44a84459a72a SHA1 a8114a2ff5b03e3c8f23104a9bd28381044ce413 SHA256 c4e808dc0d0a397e777225c6f2b4008d52979b2a4969ceee3211a8bd9d58703f
-AUX 3.6/swat.xinetd 526 RMD160 2a407763cfacfbe9b31c0901e43b4d227ea02a12 SHA1 88c6db599a1463dfd4c69392fc7374453c50ad00 SHA256 59dbb1e4669cfd5c72dacc8d8aed269f169e827338e6d6e92fa2a8e445a3ceac
-AUX 3.6/system-auth-winbind.pam 704 RMD160 4b9220ea16830f6ccb3afbcd2bef9b074c02f749 SHA1 d8ab709fb750300bcf642064015fddd1a9c3ed23 SHA256 42c80d953da2472d789c3de1311045285428a15562f7ad2371ef214d8ea7bf56
-AUX 4.0/com_err.patch 1276 RMD160 7fc5ec46212a6bf8d7f9b2edf5b182d048587d7d SHA1 e4730a95ea33e73be2762ebd4e7785849f76cc85 SHA256 f0dc953202603a5f8c0625921cd89cd59e9ca74a61302bdf07e591836e6bda31
-AUX 4.0/samba4.initd 657 RMD160 4c3221b5144c9776cf895e9eae9df16ae3e2b663 SHA1 581f78653d2e6128fc49433255241f53d2786e3b SHA256 0b8c9df0d7ec7229f6cfb397f9ee1edb9b85d4379ed088629afe11cf589a32ad
-AUX samba-3.4.2-lib.tevent.python.mk 177 RMD160 3ed0264790f5ce15106528cd485c83611f6ebeb5 SHA1 ab048fb7ba236621d82cc305ce85d129d38d32a8 SHA256 3eab52d42a0cbc070d011a131f9a56f4b3da10b2791fec514948fd8d2d013153
-AUX samba4.initd 657 RMD160 0bf3499a59ee032bd92486a32b211b779e34a80e SHA1 b5fbc25eccb63f19f5ca5cdca27ea948f0e9385d SHA256 4c8d1ecf42d58bfa1a2087ba9da55ed410ad238a0050272cb84c2e8d50b034d9
-DIST samba-3.5.14.tar.gz 30368829 RMD160 92a4297311e9f70ea994a63cc2c8cb1f06d5ea4e SHA1 2dbcfb7e35c6e4169f6a74019d28813563c3fd21 SHA256 bbdb1f2695bb4227dda0af5babf6eff55336e0d11434cde06de75f0a01d02a52
-DIST samba-3.5.15.tar.gz 30368870 RMD160 18d2ff1f59b445a9203fda2ec06c88285df15433 SHA1 4259bcfe9c03ff74bbe6c5133a53bd15f3f4f172 SHA256 c23c67c1212b7ff2e68a9e047a22200e1ad447d5ac1bd3cf24363f4b5875d396
-DIST samba-3.5.16.tar.gz 35367569 RMD160 5372ea79286787e410c2f8985180bf856e064283 SHA1 ba25360232a8006c9a00384c9588e8a51709edab SHA256 447bb56a12ed1917ae71d5b385c68f6804a25470e62a3a65477158c02a67ab7c
-DIST samba-3.6.5.tar.gz 29009444 RMD160 0180e8d4eda9634048d41de166fe7b6a07c38b45 SHA1 e41611c95b2bb91c7735928742b8aff4fc0da76e SHA256 8af65ff3b8c1155e7897c89a895e3155534ec3c5b97877ee2f05fc9d8bab80c4
-DIST samba-3.6.6.tar.gz 34061741 RMD160 70a520012a1c02085f0d6209c2acac84512d9f8b SHA1 f1516ce332fe11c68a052855edd745368ac4d8e9 SHA256 67685f2badf7451cb06ad60534784072947c3a845e4d0afec5ab7817f2ee9310
-DIST samba-4.0.0alpha11.tar.gz 13917363 RMD160 3ec5597de6a2c80eaa426712101777fa92786b5c SHA1 8ed2befbbd45f6501d9e6036bcdfb332431a7b4f SHA256 ec9f4a9153b9e2c233420642ee98a8b944322e8b39a9b6912430fb24e88b81b9
-DIST samba-4.0.0alpha17.tar.gz 20749528 RMD160 d7fda13f4d1b18c871c916487966e97f65034e06 SHA1 7c5877c6559cb4ac8fe9047d245c40448e9ad3cb SHA256 6c3a238d2ae1a98177f87465b263e34d9fb7198bf86c21a69b5276c3fea6cf09
-DIST smb_traffic_analyzer_v2.diff.bz2 12226 RMD160 82f6d443d289253a184e5f5dda17d865cb79b2b5 SHA1 1dd5100447cb827aacb8bb18bf88b7b10955a38c SHA256 1bae7eafbe8ac2382313d5ab9d43d73ba64b63a714f0f588516952d476fb868d
-EBUILD samba-3.5.14.ebuild 12342 RMD160 c0ef4eef5dee110f8cba0f87e08b6418e4418b87 SHA1 c16249727b14c5a117cfdcd5e5eb128333083f19 SHA256 1545767c4b2f24e90478c1615372b6b8cb080103cf38fcff88756431fef544ea
-EBUILD samba-3.5.15.ebuild 12342 RMD160 9c217b5d223a085fd20947e73ef3aee87a14cd36 SHA1 17d19057d371e5a5725454aef899c9f9b645f571 SHA256 aad766339433b9e2e265a0a3dec05d8652a4dd81c637388c86c7f84764b6d2cf
-EBUILD samba-3.5.16.ebuild 12354 RMD160 3a71ba6c75d36443b2d72c1bba55347035edc8eb SHA1 dc0be6df4be48293bbf82673d86ff9fb7af35848 SHA256 b08fd2ec99ab7585bae8525d9cb90a1dc6c622619cdf78f07a1c21a830655ede
-EBUILD samba-3.6.5.ebuild 11585 RMD160 045f5043176e7a148507dfa198ac9fc2de664893 SHA1 4edd9b01ede029a74485a9dbfd567095e7b6d391 SHA256 8c29a56af0f427e65812b7acb81b4d9f8aeba38a368af52dda450026bd2f300a
-EBUILD samba-3.6.6.ebuild 11584 RMD160 642117d6fd2d7d41782fb50c7de3b5d1b360ee40 SHA1 ba86320c0037b38de1c95ec796fbe44667aa648a SHA256 13554505e9e660d03b8e25b5a243d8ba3e912bd37a93654f3723db57645c2afe
-EBUILD samba-4.0.0_alpha11.ebuild 4231 RMD160 93f8fee4d9633d7541e112ff4e29acc7ba883dd0 SHA1 1863c5b92d457757964401cd0f9d89dc45d40e2b SHA256 88079c3ad65eea307dd9e870c57157fea04489fd7790b58337d8cd6b65ed2f94
-EBUILD samba-4.0.0_alpha17.ebuild 3221 RMD160 dfe6944c894deaf904f3921365bf49ceff94088e SHA1 b2982a7c1850b7717896b5a80af7fad91f89b9d1 SHA256 988fef8633eb5c192e664ef80de034060408a21a4e62d43ad9c2d47dc695ee8e
-MISC ChangeLog 86353 RMD160 5af26a796556a65d688c654121346b964b20372d SHA1 1ab26c758bdd304ddb0086ae29a3aa811dab7030 SHA256 c6763f5cf23f1e2906ab88b37573929327a664b897b96acaf1033de9b9bea38a
-MISC metadata.xml 1616 RMD160 30ca62a74056e762ab9cbdbd988d762cf53fa155 SHA1 05766875bb3132da9857ce944d8f94cfbabe65e3 SHA256 5f4d121826fd55bc58092da3d0597991a27fcf3f5e0dffd1af11c9984994fe40
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX 3.5/lmhosts 126 SHA256 f959c6e6b4179de24b2268c13b7cd8a8e400e43d0852f91dfb8dc8e48f56f80e SHA512 d9bc9c67b3f4bb128fee620550f46576a5554233bce2b2a0300645f6d60a40c25f88caf91057472b0cd1908c31d5494ce1c21a112535f91460cc97a75e0cfa69 WHIRLPOOL c691eb8df9272d5404a073e0507b16d7b8b6750af79090340733ebfb3428b1a106f6099cfb3c75e768da1e6adc2e6b89f4e7b9640144a5519a9cf8e6add321e1
+AUX 3.5/nsswitch.conf-winbind 406 SHA256 c6d461204201143f874f460df35f7fbb2345f93ed0d6c20b280c15864011e893 SHA512 15e42519630c8dc03fe5eed233c707be57290c79aa45085cde5dcaca2ea56ad9939bc981815f9fe832e4a8965cedcf61f451c9e89fe213b167af4a773b58a04d WHIRLPOOL afe807c64abcd1383872751d2cbed1e43a8f7c717a0b047022c890909484d9ab5559c0a260dcfa04313424bfcc0b64411a318f6f0a43975e846acffef2a49c63
+AUX 3.5/nsswitch.conf-wins 392 SHA256 3dbd18dc82371ef6f427dea1f626ee027d9d7be86036e2e10991f52f7041b5c8 SHA512 9cf4116d21531cb783af952ff891f0f70482aef10545f963efc9f86d281e7f03606b8607ef379bc257f51481f24aacc13ae44ad42048937d54caeae7e1f25db4 WHIRLPOOL a6ed5123aac2e125abbecbbbdf5897015aea9258258982a5b4fc585636d3810ee6cc4de0cdcfc2e9817d3a98178959771c95a40874e867de24c35a2f8fee8e5a
+AUX 3.5/samba-3.5.6-kerberos-dummy.patch 1660 SHA256 bcc2b4ad1a4ff92221b4620cb1cf2915db19c527fb28308db7ef633c0e1f596e SHA512 ced60c7483122d529be942d0486b960a763b32ee792a8d06a5d3606e095b9e4157c1ad03caab953285089ea5c7aba18c5fc68e82823529233116c578eaa726fd WHIRLPOOL 9c11a022a0d9d88a1adcc6ce724d590c2f96e6fea28d5fe3b59d8ad3ee6fce34534f9124fdc2a01cbc1ee69255a08c1e2d57acbec1c2e97215936e53852acd4d
+AUX 3.5/samba-3.5.8-uclib-build.patch 1750 SHA256 ec3d8a21fcc41a65b0dd6ae8312b3da0705628ea1002e9e79574c5e20cbe689b SHA512 cb2114bb28593fba53f0a1905b4d263669f8bfe55332cd29fa2aeb0bd338c59094f58a5b80531760a3525a984d386392a8a11165121088f35549cf4ab5ac374f WHIRLPOOL 3fd19551d7c92fb5f1b810d3779db34939253570e87dbd490c8fd482c1c00a6ebe10400cc78012363cc940c91ab641fac13cbd41aaeb16b154918d6d48dbd54a
+AUX 3.5/samba.confd 1210 SHA256 02ab523d695b5ae044b871923ad817f8931a6c20c5bfefad98a4369d7b3742e3 SHA512 34326cde9fa6c072d9b948692b292531e60a05043767ec8be78329d6e99793a16dfe134797d90da2a48e240ea5ad6e4e8ea57046732d02f71f2f4dd5316bd313 WHIRLPOOL 8e1633095d0f1540c4ead736e68b36c196b9fd760ba7f80c945be71918ce5436d64679c0314c2f58c9ef88d7be0432d8c2b75c29f3201857beb729a9c8ff5726
+AUX 3.5/samba.initd 1250 SHA256 e14e32cfc6c76fcfc9894250d980800ab61f540162d6d57065f6616801965875 SHA512 5c00d6bc1367bf4e0b376430dca60134b77239ad273721882f68559c8fb1eb4b33d00c234936d466979e5fc757832d0eebcc66b7a923b050db6628f1e958cd78 WHIRLPOOL 0c99424bf79e7e5418d98797936af52a94ee9a128950e7b15f911b5bf0b5d3359af5c9f371e63227cdcef2b6304dae0ee8d081ce2ea92ad451243db9472e8221
+AUX 3.5/samba.pam 397 SHA256 86634f2d541370518d0958a73c04776ed5df2a3716ef128ff384459acce9cd38 SHA512 cdf91112dbd4a632da13abb16bc6450a5e43cc6d0f6ccab4bd62a880855824e80b779d7e9b017680669d23f2d9c88e7ce0848ccf7e3eb7eb73c3fd3e6a6eafa4 WHIRLPOOL 8c223dfbe4a122d8d641a52209ca7d5c09b964ad7dc3d203da468df32e58bcf94e11b3eb7c3aaa69ad343a8d5f6c0bde0bbd18dedc8cea998db24e532f08fd93
+AUX 3.5/smb.conf.default 9660 SHA256 8f4fc4d137a32f92b9bc1b64f76ea25a690881cf6f385b9ce9eb0c98f2b0b297 SHA512 fa3bd2a7215e732c19a0b2ce5aa3fd1aa6adc4b0d6df10a0c669c0aab2b4569131abce29478c4357db3dbc086d430abe406aa118f59d4e8e16cc6f26fb97d90b WHIRLPOOL e2ec1fdf7c008fb35b14c348267087859158ad6d657c4d2eee4af5a65fb6727b0575afc701accde21cc7f904ad4aff61b6708b687ef4c657dda183aeded1ee08
+AUX 3.5/smb.conf.default.patch 2873 SHA256 b617b011fa8be51d1f6da18dcede5bf0fc96d50551028aa2b3a5521322b4c8c7 SHA512 ede0eec6f876890b911c8f4e8fd2b291ad381a760d301c9f0b5934a078532acff5c248a775f9bd525b807281fcbe19998ef0e69f10b0eb5dd883af5b6c92fd98 WHIRLPOOL 89dbcbf8eaa56edae224793d15522e80165d3e11bf34eb17ac86748eb2a9b049b3576c66460c2788efdb1bc624638c5e3291522adbc7fe6d84c6c457b8ca6ef1
+AUX 3.5/smbusers 218 SHA256 ed24f121813aff4b8e79c99317f4f9dfde9246d150d7718f0fa60babb8b9dca1 SHA512 0cfcc2ddea1a2bafe439b1ccd407fe4ba5b2a3f56584f0fabcfe847b407fb024b8897f9f5cb196e319292e92b61a7eefe5078dac8f67b2aca18651f80fdee5a8 WHIRLPOOL 75d0976967113caa1f69aa210d11c56797ebb9b9ba0e2c65566583ddc74a20c488ba840d589b00acf19186064a1a1bc9690a78ae9773e3e42d02f218af64c083
+AUX 3.5/swat.xinetd 527 SHA256 7919926945c9a7a28446280ea477aed2d7d3506372a03cbea96b446a8fa39aa4 SHA512 374c019bbc0232d1623e44436a03722fa47b5eb14d36f09acb02980c5d970140c24f06bb5bed87d95c89229f3944167cc39dc1ae362f2cdc564de19860eb3569 WHIRLPOOL ea808b3b6e91a2f3261440190a60c241e15f2123246ff299057ce027d2e77ee48f5bd0bf49ff3af6b8aaf90b097971d73051c4eb7f662201666c9def79b85fcf
+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.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
+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.initd 657 SHA256 0b8c9df0d7ec7229f6cfb397f9ee1edb9b85d4379ed088629afe11cf589a32ad SHA512 06e580a1a2b9b30e86b058ef4625ca20b43dbd640b370ebe9a2ee94739675ad5772bc722b1fb262540fda4d2e6936cde758c370ace58d6fdd64cc1467a779d6b WHIRLPOOL 3fa4f0335c8a4a4254d71ce987395c2f2422015d691bbbf0db61c6dac8f985d5d6cbe1fa9ab8790036dfc71afda80bcbff10c241586a20dc4bd4399a4d56bdad
+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.14.tar.gz 30368829 SHA256 bbdb1f2695bb4227dda0af5babf6eff55336e0d11434cde06de75f0a01d02a52 SHA512 c96ea21951b9d77deb658810a61e7ebc9f6d5d2f6c1f0f6c3653bc41541e6804c6bbecb79a2f94a187cfb5973b26bb5804141747123744fd8abf50193e97187c WHIRLPOOL 9f6a4d2ea6f34a8807b2c4d70a26ee43a46e8d5b3b650d99b30bfe67f46e0d30c85a9a703990fa184895bf019286ae47560a0f74da08ba9143bfd7ad348cfec8
+DIST samba-3.5.15.tar.gz 30368870 SHA256 c23c67c1212b7ff2e68a9e047a22200e1ad447d5ac1bd3cf24363f4b5875d396 SHA512 917864ba014a3180583bf8ce9d89a61c17e5d8b19256a603420481eaf69208600e0e525b9036570dabc1136b2dc0e125627b6f495ad4292f68c1722f6865cada WHIRLPOOL c02d16056baf0dff0783b6f8593e80cbe21144cbf26ef0c15a806ef6520d2d8d263a052e41eba2c66fee1dd47c0385eda119c356665fae2978dcb64accc44981
+DIST samba-3.5.16.tar.gz 35367569 SHA256 447bb56a12ed1917ae71d5b385c68f6804a25470e62a3a65477158c02a67ab7c SHA512 c836e0d69b62151513c832f6aa15b95483a6f1573296480a8c38bcc28e39284de78a98f78de5a378e9439d684c5e60d7555b6941deaafef04b3b1ab2adeeaf41 WHIRLPOOL c0bb1e6d408a4b8d7715e20f7cfab27402e46d01ef67d5a7f86fd20fd761401528d7a2246be46e564d7d84ed99d0a5e81ddc47d5afc28c13c3772c2f6319048c
+DIST samba-3.6.5.tar.gz 29009444 SHA256 8af65ff3b8c1155e7897c89a895e3155534ec3c5b97877ee2f05fc9d8bab80c4 SHA512 5ee25308e5cf89265618cb94ac6aa69e206a166fb06142c88fff1ae46f6217fda1bf93740b84e327daa9636f87849302a7298abb8bcccfe10607e537761b89d2 WHIRLPOOL d2a06b325516587c8fad2206a2e27b339958f501f9de97b9e894de89085e898577aeed443fed4221fd14e02bc0da99df8806bbd5ececbafe9a014bd3c544e526
+DIST samba-3.6.6.tar.gz 34061741 SHA256 67685f2badf7451cb06ad60534784072947c3a845e4d0afec5ab7817f2ee9310 SHA512 f9045c57bbce04bbaf5540ee92ce78437d5f53bbf424384c1c6e5a1cd0822a4e0c913a8e4bfbe836950b4195a7c90ff29c1ffd9304d28d3dd7138ca69de05b4b WHIRLPOOL 5df2dea100d3050d1f33ab3144b6c91441c7821367596e2eb64ac4936c309bcbedfc39a652c3f14103bdc4e91c075b88a7acd2b41ddc839ef0cb5f861fe363cc
+DIST samba-3.6.7.tar.gz 34067900 SHA256 b858a0f011ba7fe554881b9c7e6cb1c9cb7face22ed86860f560fcaecc4ed4ca SHA512 3b7282b010aaafa2672403e6cda7dfbb4a4d53feabe864099a96513c89a1dcb1d254a3dfa1c4a303bab1ff961ecf1a6fb58b13bffa07255d901ef2d5529b4ce3 WHIRLPOOL 23c0444a4501116a126ecaf49e48a83d47a15010dbfe7ecc96f0e705d4d8c3b03da8ba5f036b983d5a2d57282ef2217a33eff8c3d104e254c38319a4bb35a93b
+DIST samba-4.0.0alpha11.tar.gz 13917363 SHA256 ec9f4a9153b9e2c233420642ee98a8b944322e8b39a9b6912430fb24e88b81b9 SHA512 a612b8f8af31fabbff3b855cb16f15fa358ad88c48cc903c0f22ebb0f457f4666835c70ab90c76a553325353c8a71d58ca3e52302791e63baeaed64175676564 WHIRLPOOL dcf040e86971d2180289019f1be7b1bf11685133a7c2672575b6df3dee5ef870748ec0a633b0c3f254aee54c41884315e71264ad8bc7a8e468674ba6323b0f22
+DIST samba-4.0.0alpha17.tar.gz 20749528 SHA256 6c3a238d2ae1a98177f87465b263e34d9fb7198bf86c21a69b5276c3fea6cf09 SHA512 2eaa221c33e13453ec6189c0eb7155514841f52fa0e255e2f03b7daa78b4ffdd0efcfb60ff973467079ad037a107e0ea58482cd361dbe5911f6184342de796a9 WHIRLPOOL 79a487260f14de6c4c001f41d6e8cc6c2ecdc7747103ef08b398d24fd6453c6775996b5af49e0fbd3806b2f0bccf38908573f1f54ef615355b129580905040da
+DIST smb_traffic_analyzer_v2.diff.bz2 12226 SHA256 1bae7eafbe8ac2382313d5ab9d43d73ba64b63a714f0f588516952d476fb868d SHA512 aa0e457a0dd282e61e6dfcd5705c29b319832dca9711b1b5baf8373e2f079991399c3537c050219ccb861a93f86353ebff677a5c625d2e3f1f3a13ee5c4087d0 WHIRLPOOL 85ee72a360f67ebe71be5cd400ecd635280a0d7c64ebb8b94656a5ef1a94f74a987de86408af00ce1b81cc8363b1b3cf14726860d29b72ee610d4bab73d6b139
+EBUILD samba-3.5.14.ebuild 12342 SHA256 1545767c4b2f24e90478c1615372b6b8cb080103cf38fcff88756431fef544ea SHA512 96b3c3c88f5f29cbad60e4b2df125c9e6bad4f82d88035e0e312ad659b482332879409649f1cd2b85ece4096264436543d636c450c7b74cb5a2b4dae2f62545b WHIRLPOOL 3c172319be905c7e6e26f9334885ab3d56aec52cbc0834ff68e9c55d38e504a4a3a7f95e91666ecaafe19f0b3731b8980fea6a23379b2e46709bea29a5ebc561
+EBUILD samba-3.5.15.ebuild 12342 SHA256 aad766339433b9e2e265a0a3dec05d8652a4dd81c637388c86c7f84764b6d2cf SHA512 c43b443853242ca0a49b0f638fa865da261eaa1eab8b89b26986fb25e98a79a5fd741533749ea12696b5ebc794eefdae7344159ca19d6ad221d74172d8840d0d WHIRLPOOL 65c82be0756745c0322fbb63a1508dd901a0ac335798d3f15738749ad9f79bb6db4f86df6633a0acc5a0506a572e113ac8a302d3854ef9b316d42be82cf0b9e9
+EBUILD samba-3.5.16.ebuild 12354 SHA256 b08fd2ec99ab7585bae8525d9cb90a1dc6c622619cdf78f07a1c21a830655ede SHA512 4bb7520da8f173ec8a150718d6f02f01b4a689fb573a821cc23ee6b532577f4593f333c5adbd5e498e02b32d54657c39ef635dbbd1e163c555dc45d51ca35975 WHIRLPOOL ee8f767a4989c9bea1cba14aff760101bd8857ad10d117e05b45d051b29eb77b792ae5d838c158c1d29ef79ae2e820fc4ead6e3bdf59006f9919444d4f8ddd18
+EBUILD samba-3.6.5.ebuild 11585 SHA256 8c29a56af0f427e65812b7acb81b4d9f8aeba38a368af52dda450026bd2f300a SHA512 1e2f3c1e92852f3fa2a3360024a16de00123948d89475d87bf9487decbd39ef1a8c84d783939176dc8f7334161a2b480855bb6c72d0e6dcda052a449d9d8f73e WHIRLPOOL c06ea3337c02ea05e17095a01c17b12164eb17b6781378a1e22b1147997c815aa14a76699ab8fee0f67d59b20db656e0c2ddd1017382ee8902b91f83fbd33d4d
+EBUILD samba-3.6.6.ebuild 11584 SHA256 13554505e9e660d03b8e25b5a243d8ba3e912bd37a93654f3723db57645c2afe SHA512 e3cb1ca7620450e74f942aa7182d4af88e9a47aae7bac1725badd2b7d8e35e9c50adf2edb05328fd889dc1ee05ed48035a0876460d60efe4d95b0192bbdee9f1 WHIRLPOOL 0405d3d068f8caed4db6e68ec0fff7ff6daa7eda56e12dcc5008b675858e825d8096c5a54fa6d9a60db559fc48a9cf30852222210d2ab1821e1caab89980bb00
+EBUILD samba-3.6.7.ebuild 11761 SHA256 952ce5215044989d03daf5ba664a0d065b84b80886547b269966664bd66cbccb SHA512 ae06acee02811d09043e18bfb890c631efbf809caa124a7fb89400940fb9e6d0a01c8a14fc84887e6aac23dbad7a11cdd6fc6448b366b5be20293752e90a6519 WHIRLPOOL d51d0a76a0c44eacc5b85f84914ba590b3b176b530041f323e8d59aa7dc2fc6be2abbaecb3922c391e17eb389061778c2cfd96d40a9d7b23dbef181ff01e7964
+EBUILD samba-4.0.0_alpha11.ebuild 4231 SHA256 88079c3ad65eea307dd9e870c57157fea04489fd7790b58337d8cd6b65ed2f94 SHA512 3da618b057a75d3961e3b1d4ac1448a5d6138636cfa2afb6d9a344d06cd839cb300116d001ad6735d7492cc6ce2c6fcd899f5c24da1e16ba8490457c16d6332e WHIRLPOOL 4f38bffa504e1b261b784e795d92c416efe47b1c03294883bad08d019d84a112f0e22c7b34dc0c09ea3898bf37c7c82cabf01fabce379b947fbfd5ddaf2b1b13
+EBUILD samba-4.0.0_alpha17.ebuild 3221 SHA256 988fef8633eb5c192e664ef80de034060408a21a4e62d43ad9c2d47dc695ee8e SHA512 c089b45bab4450e4e8954810b8325b3c9df08ec0af1c4965a01bb5a0fd7ffa52aa89548d09789797e23c30acc478e1bebd7a529f3463319937697aecd99a50c9 WHIRLPOOL 01d7a5b6bfbc37e51f24493e8706c532d568dd5a3ea945554633fee7cc4696aa3ee727299038f801c38979f5464a42de1dedc4e39d88db9ea59c83ab8abbdeaf
+MISC ChangeLog 86623 SHA256 374fcce19ec65c8947b1cfb307024f5d5753e43b01de12ab02accfc280986df8 SHA512 4ff125280b946a8b1c0045358d26330292529e9e91ef568dc8621660239e1b9c476e46051f7bc8bf91f8afaf4bf3dc2645a1fac5bfb26f273f6c23973735af00 WHIRLPOOL 60918d8f2316e1358382d935745fa355ce2d67d098976e11917cf06c95d2a8e2fd5980e868808b395655cbe593151a84d6860f930866db238bb15258c5642127
+MISC metadata.xml 1720 SHA256 eaf1e48006a5370c02490df7de6bfa6187dec8640f23688c304337e4032e2703 SHA512 902757aabe52be47c7ad4e3a6a63da2860bb13664ef61f592d815205bb447cf8e3c74761b44a1fb2e5d22ea1d06841fe995510ac266bcaf6b85e921809684129 WHIRLPOOL b0426b5e14b48fae3b50551217f2650085942d0b4fa3a1200f204fa8ce272c14c3527a57e62e71038700d2cbd69cf75865b2df4ffddf2c309ce96e20c528509b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlAktyYACgkQGwVqY66cHjB6bgCfapo4jKZ4AAGeOyzLjskz97vp
+yKgAn1n6p4la0lgNIr3e5P7WrKY8VL1w
+=SI2X
+-----END PGP SIGNATURE-----
diff --git a/net-fs/samba/metadata.xml b/net-fs/samba/metadata.xml
index 6db9563ef26d..bd9570e510b7 100644
--- a/net-fs/samba/metadata.xml
+++ b/net-fs/samba/metadata.xml
@@ -21,6 +21,7 @@ Samba is an Open Source/Free Software suite that provides seamless file and prin
 	<flag name="addns">Enable AD DNS integration</flag>
 	<flag name="aio">Enable asynchronous IO support</flag>
 	<flag name="cluster">Enable support for clustering</flag>
+	<flag name="dmapi">Enable support for DMAPI. This currently works only in combination with XFS.</flag>
 	<flag name="ldb">Enable the ldb tools</flag>
 	<flag name="quota">Enables support for user quotas</flag>
 	<flag name="smbclient">Enable smbclient tool</flag>
diff --git a/net-fs/samba/samba-3.6.7.ebuild b/net-fs/samba/samba-3.6.7.ebuild
new file mode 100644
index 000000000000..a5891331bc19
--- /dev/null
+++ b/net-fs/samba/samba-3.6.7.ebuild
@@ -0,0 +1,441 @@
+# 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-3.6.7.ebuild,v 1.1 2012/08/10 07:24:10 dev-zero Exp $
+
+EAPI=4
+
+inherit pam versionator multilib eutils
+
+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/${MY_P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+IUSE="acl addns ads +aio avahi caps +client cluster cups debug dmapi doc examples fam
+	ldap ldb +netapi pam quota +readline +server +smbclient smbsharemodes
+	swat syslog winbind"
+
+DEPEND="dev-libs/popt
+	>=sys-libs/talloc-2.0.5
+	>=sys-libs/tdb-1.2.9
+	virtual/libiconv
+	ads? ( virtual/krb5 sys-fs/e2fsprogs
+		client? ( sys-apps/keyutils
+			kernel_linux? ( net-fs/cifs-utils[ads] ) ) )
+	avahi? ( net-dns/avahi[dbus] )
+	caps? ( sys-libs/libcap )
+	client? ( !net-fs/mount-cifs
+		dev-libs/iniparser
+		kernel_linux? ( net-fs/cifs-utils ) )
+	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 )
+	syslog? ( virtual/logger )"
+
+RDEPEND="${DEPEND}"
+
+# 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"
+
+	# 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=/var/run/samba \
+		--sysconfdir=/etc/samba \
+		--localstatedir=/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=/var/lib/samba/private \
+		--with-rootsbindir=/var/cache/samba \
+		--with-lockdir=/var/cache/samba \
+		--with-swatdir=/usr/share/doc/${PF}/swat \
+		--with-configdir=/etc/samba \
+		--with-logfilebase=/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 /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 /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() {
+	# 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}"
+	fi
+	if use smbclient ; then
+		einfo "install smbclient library"
+		emake installlibsmbclient DESTDIR="${D}"
+	fi
+	if use smbsharemodes ; then
+		einfo "install smbsharemodes library"
+		emake installlibsmbsharemodes DESTDIR="${D}"
+	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
+		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 "${D}" "${ROOT}/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 \
+		"${D}/usr/$(get_libdir)/samba" \
+		"${D}/usr"/{sbin,bin} \
+		"${D}/usr/share"/{man,locale,} \
+		"${D}/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"
+}
+
+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"
+}