Version bump. Removed old

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

7 files changed, 87 insertions, 912 deletions

diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog
index 8acb50a4d88f..a9bb1eb868c1 100644
--- a/net-fs/samba/ChangeLog
+++ b/net-fs/samba/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-fs/samba
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.579 2013/05/12 08:48:34 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.580 2013/06/07 12:53:24 polynomial-c Exp $
+
+*samba-4.0.6 (07 Jun 2013)
+*samba-3.6.15 (07 Jun 2013)
+
+  07 Jun 2013; Lars Wendler <polynomial-c@gentoo.org> -samba-3.6.9.ebuild,
+  -samba-3.6.13.ebuild, -samba-3.6.14.ebuild, +samba-3.6.15.ebuild,
+  -samba-4.0.4.ebuild, +samba-4.0.6.ebuild,
+  +files/samba-4.0.6-add-missing-new-line-to-fix-python-shebang.patch:
+  Non-maintainer commit: Version bump. Removed old.
 
 *samba-3.6.14-r1 (12 May 2013)
 
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index fc78d95e508c..e39344d7d4ca 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -27,29 +27,37 @@ AUX 4.0/samba4.confd 1783 SHA256 53755809cc27fdbaf98752cd3da45b5c2bda62dd46fcc37
 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 samba-4.0.5-fix_linking_to_heimdal.patch 704 SHA256 ea08ca8edf6d2e8842d0a184f3fff8159df7936f39d73fed7ee8db6ba3169940 SHA512 0ba583c888c2fa943fa466a91c27180c1124684471d3721594769d393f385e4ed5da75161659b6eb16849874205c666f314c4334866c82fd82094be4df6a306f WHIRLPOOL c16c4c5eb7fa5b440f7d11b17370e015275bb16b39591e04b0404da123af4c3c6c62771cc896693782d5aa628358b0f46792e46c147b4170020535d6c7944a54
+AUX samba-4.0.6-add-missing-new-line-to-fix-python-shebang.patch 1123 SHA256 9c865653dc94ef633e5600cbb1301d31f288aa4238bf367d4c78378431d52d4f SHA512 9e74c4b8086cec9c0bec663c7cdf5a2b25ec0d791cf139b1d264fcf660b15b5ea20c4373f1fb6c0620b289fe9147e2d61562602217763af0887cfead85fdd41e WHIRLPOOL 9bf923ef135d274d49e702caaa815acefc90d2faf8ed4106cb3084e7f69bc3428cb36ce179a979c9979145d38fa180f23cccb05894b663409b1b2e56809a4fab
 AUX samba4.initd 657 SHA256 4c8d1ecf42d58bfa1a2087ba9da55ed410ad238a0050272cb84c2e8d50b034d9 SHA512 3373f2ad30938dd8c2d68d19af4e248470e0b6d749b53257c97d3a0792df54f9ad61a33175ae3e576b728cc11a6ae5fd8803c22188382c7b50ca041b98b84ce7 WHIRLPOOL 25f6a313323b3076ad2a5ff733b1ed4bae1833bf5d4d1aaf9c75449e578ca479998b526a1fdfefbe5d5436c94cbcf6b38934bda1ddff8587f8820a2ccb5ce1e9
 DIST samba-3.5.21.tar.gz 35377315 SHA256 fd9a66056b1ba9496762394efff41fcaa0e58f2e50e71910e6d202b8a59a1c10 SHA512 e6d52530094b2f8284f8536f97411c3944a83e9f1a808836acdca19fe4aee3cc47e136cc2a2eab96ba89526fe289ec1a3d22fb836bd261bf7c8ddfbccd1cf975 WHIRLPOOL a476ea24841cfdec0f640880e0362173a3f6b957afd2d2448f7b4a8b7c927ef558fd22e7fe20b05bd8aecf1169d8e488b87830a99ddfddcbc8be0c9a414966ad
 DIST samba-3.6.12.tar.gz 34073788 SHA256 6ff797c1772613bd5172d2c8b900fd56bf096d7252faee8b47c4925a4fdc9f8b SHA512 06a7b8883a18b802de5aeced2e7dcf97147351b621736ab2383c6e4f22d5fb14e2b1ce88c8137a2fa9571b25357c766b0fb2b31352009b8a7137b20e2e9c3416 WHIRLPOOL 6f41dd455a52c9397fc4e7429aa5312573a9a1888ecde94a25be9d000a6567374e5eb60c3c0a76151f8628e8ee8c68cdce234fb51f4163c9a3996acf74b1f4a7
-DIST samba-3.6.13.tar.gz 34101849 SHA256 992f8ad56717bf551b00ad1d31170588a087fb5c2d4d9cd38fd11544f2b8a596 SHA512 1b1d72a6166885d168a4892b1e8ed2f0affbcd76819bcbabc4093743b15d6e4972cffd53b7e9770baad95b900c3dbf66259fc410cf8421127585fdfb3ffb270a WHIRLPOOL 465448d051c56df118e205378ba6fd655a19cb777bccbe7296c86cb7e08839b7c4e92820c4c593e0a52db37137a7e0e46f08cb734f61f4144ded9fd5ad702651
 DIST samba-3.6.14.tar.gz 34108316 SHA256 4f9239003def9319e6f1135d5bfc5ffbb1df390fede882fee25767ce1a9cbad9 SHA512 786af93aeb92783761bb98559382847d4fe2ec73ef3b0f5c453f0bae3bbfeaeecc860591e26fcbd417710431ba21c7552206b71a68ff8bec46f21252199be1ce WHIRLPOOL f9cfd74ff277b70f7e06f324ca2a55bd9247b4041469511b1754f47342acb463ebd17fd87e33365cfd418b13dfeb49755d23045d5793ed79f01c3a06b388e3ed
-DIST samba-3.6.9.tar.gz 34077002 SHA256 9714b50c1bbdb0d3521bdbf403bb112b5405040685cb0b4ff3f9a370d1e84020 SHA512 be0c9d2a51a524015a1210d96c775c754101a2906dc054f3ecae97d18d4e0d50de2ac48a85af62a30d020259ff91068947831e44963925efe3cc48c8051a3be7 WHIRLPOOL 4e4f091329517872117160e167cb60ce71cfd441a0b6eb46157aa48b16369e887b7373b9c2bada8751de62db10f8db748f53ecc28a90b70aaf38df3af2649b1e
-DIST samba-4.0.4.tar.gz 22055293 SHA256 20a84280155543892ce939e70482243396a9a8bfa77dcb4bf58328f7029772c5 SHA512 f27925bd978eabe79c720d3697964fbfd70aaa2eba0eeeeb8de29f4f448d1a3a198c03b289f5f60e4910fcfc46ff7bce695e4726997f42bc19f406fc3c9d5456 WHIRLPOOL 01b44914981acbde5629410925b878e91195a0339f20520e9de09fdf74d33d8460ee5a05f15c078430100a121538593a50c8e0f31d7a2f92116af9f675d0160d
+DIST samba-3.6.15.tar.gz 34111211 SHA256 42b9acb13f8760a1767829ebaa4c371e462aad5287caf92887e64930cf27da60 SHA512 82a2a76a54c309d4107c19d42e3e9c8cecca0e065095a2471f71bfafcd3883e0a9f06f74e330d3020bad6220f72f4765e9f8c9bed331bafbc69ac0fc080cc537 WHIRLPOOL abff8fbc44222165b0dc32bdb050e785d77c1b1d160cf5b002481a16cf4a841475bd0a0456d2e398482cdb3b3557b19d86fef2da3bfd1ea5aa8303c663cb3c29
 DIST samba-4.0.5.tar.gz 23958079 SHA256 c1175079d5724441e558982246128ee0578bb0b300e335e91b82ed97b03733f1 SHA512 a610c343f5429c0d155420ffcadabe99b95626de6f0a1c149874cb09c50cb5de7b0c6163b130f1ccd1cc25cc0db18da25c4d17532bc06db13594eae62327921d WHIRLPOOL 54ff5e38a868c0c3ff48c446cad678bb9a1adfc5834fb06e016a80badd4ca965fc8f6a3d4e26c29c9c3d5c39d8116d96c496d77fb50b6a7da62cc027862e5422
+DIST samba-4.0.6.tar.gz 23949307 SHA256 63e53dc270d13231bed56b816c18793d8425f199b1a5efdaadc080f4d6911de3 SHA512 761fa945fdef1ddc7688e8482324aaec10f68252ff201b11739eac9863e3c4ee0d0207b87c735c529d7a62ae65785d146de7e9cd37fdac2c4463e1692635ee11 WHIRLPOOL c8d8ba019c2823da8e73b78496aa5fcfff4e518d66a2915b7fadc6337e18da8f6d379200b03eea0eebf2d6fdd49ae9828e2e1bc1ae5014206f54f21f39d25d02
 DIST smb_traffic_analyzer_v2.diff.bz2 12226 SHA256 1bae7eafbe8ac2382313d5ab9d43d73ba64b63a714f0f588516952d476fb868d SHA512 aa0e457a0dd282e61e6dfcd5705c29b319832dca9711b1b5baf8373e2f079991399c3537c050219ccb861a93f86353ebff677a5c625d2e3f1f3a13ee5c4087d0 WHIRLPOOL 85ee72a360f67ebe71be5cd400ecd635280a0d7c64ebb8b94656a5ef1a94f74a987de86408af00ce1b81cc8363b1b3cf14726860d29b72ee610d4bab73d6b139
 EBUILD samba-3.5.21.ebuild 12567 SHA256 4f7389da068ff867ec8c03afbc451e17580df49a13b4db16aea1532e5d77eb57 SHA512 344036c801e850d097d84f3b6badb83fb1777319d6d90caa8be5621e7a15e6011a07c1a30c7f8870bd302b686511940fef1e03179484a4c37b816e0ff6be06f5 WHIRLPOOL 3b099715d1c01cf241f1fcc6110725f3fb50fb9808aa58b02232ae7a545cc01a7c04bf886dbde14c85f6e12919dbf0aa4acb588d37a059d8db5bd1529a95c4e7
 EBUILD samba-3.6.12.ebuild 12017 SHA256 b1a4ae0e490e6e3ecbdef24b9a50336e676cb39f6077044ef9e99f745e433147 SHA512 f377aa4ad20d5a05d31a492935251040e2a3c4522fb774fc2918d09d629480551a6eb359d1079fd4ed9eed9339985977d5f792358b0b74d426261e01dd662c6e WHIRLPOOL dd77e2be95a4766cce5dab5f06ae5f4064f0824a26018e191ba881cd2aec6a865762441f8f983114f21d58edcbc5dad8c75fe9409db2e4270a6aab64944b7153
-EBUILD samba-3.6.13.ebuild 12020 SHA256 95d6e3caaf3baf1b9bb373a536a9967828e96e004ba787df05b06e1707d7a892 SHA512 8ec3952b08c029e7cfb83dacbcde5bf79fa248ae424d339338a40aca6bc9f4ea7716f14b420fd4cc3379a4da5aa5f27a63eb3173d88d8abe8e41545f1569486d WHIRLPOOL 136638b30b065b7e0d7af6e96f5f57a071e22cae6c4cff2716ff6cbabe91fea00980ff567e5dac18b7f17440c6ea65618a842b3ba5262ae4ed5f322deeac09ba
 EBUILD samba-3.6.14-r1.ebuild 12343 SHA256 516abbf4c568b40aedebf503410d7f3fc057adcb8940d3705a5cfa37446493bd SHA512 72258ddc30635c2d35d60ad2d76527588f1d7fa4865866f396c6ab363646968521dc34538c8f7f012877c5c18357d1d8bfcf7d0e4c63bfc4e77549e307542fc5 WHIRLPOOL 7640aaffdf63ec2cca58b715f547f56de0e5da03f0ba1cece2160dd71d0131f5d010216cd813d27c9dd879046891823b93dd5df004d229ac0d5ef744c26899e0
-EBUILD samba-3.6.14.ebuild 12020 SHA256 e0baa03cd92a01501cbedce16e490059809ff586dcaac8e0003354f8d7c33b6e SHA512 38b06f3fbdb685268753adfb0a49bc7b2072ec53c7a02de359230a9e74d090050de6773a3a277cc9f86c6821ec94793e637252eccf8ad0ed2802c4ea6d747b98 WHIRLPOOL 31e04576951e909c79df50b20451dbd17f4f150e5d8c101b9bc5f68be9a7ed1a9829a7c0f1cc0cf43e5383682cef182a8340a293b8113fa059dc73676d9bd399
-EBUILD samba-3.6.9.ebuild 11843 SHA256 c12e87494c00cbcc91ad1c6d427d6bc34ff86d77137882fd1101cad04e81a855 SHA512 84d4116f75f004d0dadbc143519eaa9174c5d0cceb606a7615c3eb192eb615dfaf9edfebb676a9a6d30e975ea48b8f1cfb118f07971a4676cc3ebf905e680ed4 WHIRLPOOL c69d7caa67ed25f4a62c3f28ba94c48cb5d251e7935ae559a6bffa88451cd9e9ce055628644a639bdd2f87c0e7334071ab2e82007c33f75cb832e06c9e378aec
-EBUILD samba-4.0.4.ebuild 4090 SHA256 90b8c07adfe0e5b24a5e6b7409c0ee4b64ef2a7ab182238d7a102455480a8fea SHA512 24f5b8745dace2d00a7c8fd8cfd35628b7cb5ac8088fc6a0be36fdbfb933a1d2a89744e0b96065e8cfb53ddb15ecebc1211e91c032245fa4ec71a5253c6f7ec2 WHIRLPOOL 5f294fd9e320b8c886a272ccf240f7a43a63e1da8dfbc5a5af61a38aa52fabefa41b4fcb23a1bc8b2a2be627133a0c3120d1c5de6cc275631973ecd3e5d3352f
+EBUILD samba-3.6.15.ebuild 12347 SHA256 70ceef21473641490f6a5b2c8ff8c2b0306fd6edf6578f278eab616a95b971f3 SHA512 2e474e0ae66f3b1b5041d839c199a6329640786c4a7b0fd34d76ca4246a25ea77464ab31f497d1c5febba2d9f0d582965f63355062dc37bd125037808fb0f4c4 WHIRLPOOL a39b87d43dc4102de248b3fa6b9c99107b4bf6f3427e978dffee2eab1ae24d42484ff0ed0630acb0089702c600281aa2d4b1d15d6414548878e8b4d67dac6a7a
 EBUILD samba-4.0.5.ebuild 4108 SHA256 ee056af6d62ccfe62771d78d4940dfeeaffb041b3c03defea8ce201474763bba SHA512 1ea07c0f7a4831b92ea0c18d0616496cfaafb057531d635a5c2dce9a507df1e32e96166f80ac2f3c9f54a41a7d5ca1c1108cc0b4ec648024cae8400ec69518c3 WHIRLPOOL f6e5517e135858565b4bb0de81f9f2cf01476bb70a5b87440fbb728d76aceb3c90e960655d9c77df0fc9f76c36b7c70ab4851ba5d3595dd65810c2422b71c3f3
-MISC ChangeLog 95556 SHA256 b44b4d67a1c16c89300eb77c1f9dfc9130b46e7803007342b9ced8ad16ff6a30 SHA512 03110d597b31a38fc1f024900857c3d31fe93906715d1fb48aec2f55da7eefb11639d76b0bba61b97777b2655e53ecb131c40b47dec88f3f22af79a6e99f603f WHIRLPOOL abec5777ff0a1fbf9fd390c59b7c9ad1e9e795074b0af87ec7d7c63d34e47353099104751fdb4ac87acdc1d41ad80aaf78ed08581d97fb7a62ed4858503889ce
+EBUILD samba-4.0.6.ebuild 4100 SHA256 8bcbd66efbadd379f605e5d2db9bc7c096b6a9a73871e8ea8fe56a7ccb6ade60 SHA512 efac7c5c9f87b43356edc3098056a9b6a1df1f7c9a41ece3ff4062b07dd8b5d1c7c4c6ec02de98540ced8c3aec10377627197744d3231fc91d1fe69d63c037fa WHIRLPOOL 427573bdeb6cc6de80100de10c602dd09f29b6ea200d06e6e3876698e01c979db460d89ad4da34e5bda9ba5cc8aa190b9940c33fe19103327311ddfe53032614
+MISC ChangeLog 95930 SHA256 01a1db7002c290f418e78b583d6627b09da3e8abc89569792581b4e0dcf7150b SHA512 a1acf4cd7f3c8ba1089a381d4583e1e17f1b7ff30a9bdf4a77ef34f756c280a388bf52bb550cae27ab4b698c76568f1e1708ab89c7446cb7669ab8fd1fe9cf76 WHIRLPOOL 56d0b67d33576769f97778ee1a865db621639ec3146964f489f336f09f626bfe9ebb8d5d02295e651e071736423e43e52989719264a08076064429cc752226f2
 MISC metadata.xml 1514 SHA256 c10deb71703017ec67f4e5bac297d9b4581fec3d8b5549b6aea2a43bda642bc0 SHA512 9e67e8f7e0c972046e32bf4539142559c24183d6c3469e5af2f901728a3c02a9fbfd50e948a9fd414107fd0cb2a8de709ffe3fc5bf3372c77a4a3db6dc622ecc WHIRLPOOL ec92ea6a1b03e70c791670e97e7d9e07e6bdb82c24ed08c186e786afcd009ab63fbee7d481a4cdc394632ad312e58a2048dae3ff333f6f7a1ad19add55e2c8f8
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlGPV2MACgkQCaWpQKGI+9QgawCeIZ2K9J6UJ77TKe8aafnbxps3
-6P8An3vrblv7entOa1tqFiOihcXmHPeJ
-=jo8H
+iQIcBAEBCAAGBQJRsdfFAAoJEPiazRVxLXTFk5UP/RQHQb1BcRkxZtXUsP70H+2E
+i/S4QEyXn8b71AJfAne+hQGpUjzPg7sToFp1lH1dH10aAQV3rzCOVCFL0J/HdD8E
+Xcmhy713qCsbvhHQ0NeQnE2xfTG6SBJnHezFya4qCSBcQA9onUgxqkML/UZf98C1
+tp08EJC2vZDPBDQY25GQC88mPxj6q+TB3Ze4aYsguSmQbgyriQLtxCf4jVdZ3mva
+nvO8QfTmX3JvLisLACRBaH4C2WPtV1K+KnMhFY002hT84k00DTnf1EJc6SAnq/xd
+2D+eY7rYB24aPWJQb0zISKrseKJ/I/J/+OyDmzvVyZEzmO0GEXkOTNWVY5XtQCZF
+xjpnP4KVebaWyBN5poXO/nbI6X4gYN2Jvkafdr2iLKS1Pj8pQv1eGhCcgxVFPLxr
+ZNRn4Nz9RSUDVfJT3hWGdzH2dG4dchxsfBGQzaHoWSDTnU1qzPsC9NJOfTtNjuFy
+HQWgL/zGYC7fKoZoIvZ71CDpWKPrk/+z+6JCNe7S/6/NiMauYDECv7VwZ242BdiD
+aasIfHZboq8aQCj0NMlZ3GFiyXp/QxR7l3rLucPWaEzRpSaM8a1WWEP9psQ1xUSG
+O45osMkX21RTb/LOdsybwlbXOYamHpHkRockLBaANROztWzY0M5iP/lJrFtZ6J1q
+l/6MayiGBxqpmvbDJoce
+=tjR1
 -----END PGP SIGNATURE-----
diff --git a/net-fs/samba/files/samba-4.0.6-add-missing-new-line-to-fix-python-shebang.patch b/net-fs/samba/files/samba-4.0.6-add-missing-new-line-to-fix-python-shebang.patch
new file mode 100644
index 000000000000..bab2d882849d
--- /dev/null
+++ b/net-fs/samba/files/samba-4.0.6-add-missing-new-line-to-fix-python-shebang.patch
@@ -0,0 +1,29 @@
+From fb9334099771e6e4d50715f3c5dedce1866a6e0d Mon Sep 17 00:00:00 2001
+From: Michael Adam <obnox@samba.org>
+Date: Tue, 28 May 2013 12:19:34 +0200
+Subject: [PATCH] wafsamba.py: Add missing new line to fix python shebang.
+
+That fixes e.g. samba_spnupdate on some systems.
+
+Signed-off-by: Michael Adam <obnox@samba.org>
+Signed-off-by: Karolin Seeger <kseeger@samba.org>
+
+diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
+index 3559cc1..8eace08 100644
+--- a/buildtools/wafsamba/wafsamba.py
++++ b/buildtools/wafsamba/wafsamba.py
+@@ -699,9 +699,9 @@ sys.path.insert(1, "%s")""" % (task.env["PYTHONARCHDIR"], task.env["PYTHONDIR"])
+     shebang = None
+ 
+     if task.env["PYTHON"][0] == "/":
+-        replacement_shebang = "#!%s" % task.env["PYTHON"]
++        replacement_shebang = "#!%s\n" % task.env["PYTHON"]
+     else:
+-        replacement_shebang = "#!/usr/bin/env %s" % task.env["PYTHON"]
++        replacement_shebang = "#!/usr/bin/env %s\n" % task.env["PYTHON"]
+ 
+     installed_location=task.outputs[0].bldpath(task.env)
+     source_file = open(task.inputs[0].srcpath(task.env))
+-- 
+1.7.10.4
+
diff --git a/net-fs/samba/samba-3.6.14.ebuild b/net-fs/samba/samba-3.6.14.ebuild
deleted file mode 100644
index f8d9eda94ca8..000000000000
--- a/net-fs/samba/samba-3.6.14.ebuild
+++ /dev/null
@@ -1,442 +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.14.ebuild,v 1.1 2013/05/06 05:37:24 patrick 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/stable/${MY_P}.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~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
-	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 )
-	selinux? ( sec-policy/selinux-samba )
-	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="${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() {
-	# 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 "${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"
-}
-
-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.13.ebuild b/net-fs/samba/samba-3.6.15.ebuild
index 81374ecd9c83..9b9dcf31102a 100644
--- a/net-fs/samba/samba-3.6.13.ebuild
+++ b/net-fs/samba/samba-3.6.15.ebuild
@@ -1,6 +1,6 @@
 # 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.13.ebuild,v 1.1 2013/03/24 13:15:21 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.6.15.ebuild,v 1.1 2013/06/07 12:53:24 polynomial-c Exp $
 
 EAPI=4
 
@@ -251,6 +251,9 @@ src_compile() {
 }
 
 src_install() {
+	# pkgconfig files installation needed, bug #464818
+	local pkgconfigdir=/usr/$(get_libdir)/pkgconfig
+
 	# install libs
 	if use addns ; then
 		einfo "install addns library"
@@ -259,14 +262,20 @@ src_install() {
 	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
@@ -296,6 +305,8 @@ src_install() {
 		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
diff --git a/net-fs/samba/samba-3.6.9.ebuild b/net-fs/samba/samba-3.6.9.ebuild
deleted file mode 100644
index 7abb08f92a24..000000000000
--- a/net-fs/samba/samba-3.6.9.ebuild
+++ /dev/null
@@ -1,442 +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.9.ebuild,v 1.8 2013/01/09 11:42:30 polynomial-c 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/stable/${MY_P}.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm hppa x86 ~amd64-fbsd ~x86-fbsd"
-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
-	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 )
-	selinux? ( sec-policy/selinux-samba )
-	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"
-}
diff --git a/net-fs/samba/samba-4.0.4.ebuild b/net-fs/samba/samba-4.0.6.ebuild
index a08f87749080..625746cf6bdb 100644
--- a/net-fs/samba/samba-4.0.4.ebuild
+++ b/net-fs/samba/samba-4.0.6.ebuild
@@ -1,6 +1,6 @@
 # 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-4.0.4.ebuild,v 1.1 2013/03/24 13:53:10 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.0.6.ebuild,v 1.1 2013/06/07 12:53:24 polynomial-c Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_5,2_6,2_7} )
@@ -35,10 +35,10 @@ RDEPEND="${PYTHON_DEPS}
 	virtual/libiconv
 	dev-python/subunit
 	sys-libs/libcap
-	>=sys-libs/ldb-1.1.15
+	>=sys-libs/ldb-1.1.15-r1
 	>=sys-libs/tdb-1.2.11[python]
 	>=sys-libs/talloc-2.0.8[python]
-	>=sys-libs/tevent-0.9.17
+	>=sys-libs/tevent-0.9.18
 	sys-libs/zlib
 	>=app-crypt/heimdal-1.5[-ssl]
 	addns? ( net-dns/bind-tools[gssapi] )
@@ -60,6 +60,11 @@ CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
 
 WAF_BINARY="${S}/buildtools/bin/waf"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-4.0.5-fix_linking_to_heimdal.patch"
+	"${FILESDIR}/${P}-add-missing-new-line-to-fix-python-shebang.patch"
+)
+
 pkg_setup() {
 	python_export_best
 	if use aio; then
@@ -116,21 +121,18 @@ src_configure() {
 src_install() {
 	waf-utils_src_install
 
-	python_replicate_script \
-		"${D}/usr/sbin/samba_upgradeprovision" \
-		"${D}/usr/sbin/samba_dnsupdate" \
-		"${D}/usr/sbin/samba_spnupdate" \
-		"${D}/usr/sbin/samba_upgradedns" \
-		"${D}/usr/sbin/samba_kcc" \
-		"${D}/usr/bin/samba-tool"
+	# Seems like the build script gets the shebangs correct by itself
+	# (4.0.6)
+	#python_replicate_script \
+	#	"${D}/usr/sbin/samba_dnsupdate" \
+	#	"${D}/usr/sbin/samba_spnupdate" \
+	#	"${D}/usr/sbin/samba_upgradedns" \
+	#	"${D}/usr/sbin/samba_kcc" \
+	#	"${D}/usr/bin/samba-tool"
 
 	# Make all .so files executable
 	find "${D}" -type f -name "*.so" -exec chmod +x {} +
 
-	# Move all LDB modules to their correct path
-	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 and conf.d file
 	newinitd "${CONFDIR}/samba4.initd-r1" samba
 	newconfd "${CONFDIR}/samba4.confd" samba