Fixed compilation with sys-libs/readline-6.3 (bug #503580). Removed broken versions

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

7 files changed, 62 insertions, 371 deletions

diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog
index 5272d3bf9e17..4987308c731a 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.653 2014/03/01 22:33:48 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.654 2014/03/06 09:35:19 polynomial-c Exp $
+
+*samba-4.1.5-r1 (06 Mar 2014)
+*samba-4.0.15-r1 (06 Mar 2014)
+
+  06 Mar 2014; Lars Wendler <polynomial-c@gentoo.org> -samba-4.0.14.ebuild,
+  -samba-4.0.15.ebuild, +samba-4.0.15-r1.ebuild, -samba-4.1.4.ebuild,
+  -samba-4.1.5.ebuild, +samba-4.1.5-r1.ebuild,
+  +files/samba-4.x-readline63_typedef_fix.patch:
+  Fixed compilation with sys-libs/readline-6.3 (bug #503580). Removed broken
+  versions.
 
   01 Mar 2014; Michał Górny <mgorny@gentoo.org> samba-4.0.14.ebuild,
   samba-4.0.15.ebuild, samba-4.1.4.ebuild, samba-4.1.5.ebuild:
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 3ff3008bd23d..8e23d4b2486f 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -32,6 +32,7 @@ AUX named.conf.dlz.patch 500 SHA256 477117ab87047e1a40c6c97a674008e2e671ae096a2f
 AUX nmbd.service 224 SHA256 a5e25c11714206c4fb129333dd45152c5753716c6445cbe78c28275df1a1cb77 SHA512 098dfb270c5a5c29f59b4fd8d51b17931771e25e481124832f1a086677825527e2afa7276e8614e5007fbf044d253ce2eaf3a7caf7461ad5d90d0b1c7f157f9d WHIRLPOOL 2f7c342a60c09d5e40e968a026aa17d8c2fe3fd032331c7bb26599bb0f8ec8a77c2a3e329498ed16b1602451fd85a8ef076c436e8a092740cfbd01a82ca52e30
 AUX samba-3.4.2-lib.tevent.python.mk 177 SHA256 3eab52d42a0cbc070d011a131f9a56f4b3da10b2791fec514948fd8d2d013153 SHA512 0bd691d7678737fa815da9e1934db056fa833aa6d6d2d48cf8da559987a899ae4c5ac18e4b3594d634363f515028a3d30711484dbda578aa7506fbe2df55197c WHIRLPOOL 061b3e33b327563f52648931428cce433505353e73bf9851abb33f4f13e7c723c17c3413442dd343477bb0c49fd3284c0155ff59829df448952a6e1d07475251
 AUX samba-4.1.0-remove-dmapi-automagic.patch 2755 SHA256 debf37a220205526ec54b121f23d1be93d8595fff54184099ae647759876eedd SHA512 dcd96d1ce66918072de7c60e116cb01320b5b8ac5f06856d3298628b31c69a8fdd00771100540889b57c8a4a38a142d56b145a05950617488849243cd7b339b4 WHIRLPOOL 81c31a4c8cc011327c8e7d16bf15e3fd96a36c47dd985bd146c2559c20102517b2aa643ce24a64c52331fc4ec0858299cf3cf8d705a34e22ca94b093c4101c7e
+AUX samba-4.x-readline63_typedef_fix.patch 932 SHA256 a97b47021c0b38ee1db12b2d3a9cbd73fb4ceb60a616cb38c2be52b02f9d6d0c SHA512 a074eb59a2915d2f60bed79f3ba118b72cdba78a13f5d1fa1a79c346aab21c3676a803aae2b18414bebf42891e064fdbb22b57b37d76a90ba59ccfb012170707 WHIRLPOOL adbbd60446eb1d9534868902f4ce310165b9b93a6a4a8a9ac97803e07ddb789f35c598f977d876913f7f2b62ac0ade570dfe2e5f52439fafb966f54eb89cde4f
 AUX samba.conf 28 SHA256 7457c27215898cac4813a59b8018ea68ea46a692ae0eeadbafe9ad2f2c8c6a8d SHA512 51e3b2499eaf2550ca8290f30821c4a79ad6582a4add5120978f2eb06b374e494072db423e5c87ba4b9f3426a37d9d38701b907459e3a6171f205b5b6caee7b4 WHIRLPOOL 67e6dabd922bb95ffd529385b1c8f9310c610bedba26c9d35e20f35bb5c176fff787c78bea8b80f414755104feedb6b22401c3d20d8420381759eaa62dca3406
 AUX samba.service 199 SHA256 0ae738fa2a15b476dbca016dfa4e1cf4b8c4a575e13edf518eb70b615c02a059 SHA512 eb277917f15de958f4a0404b66c6d2cc82ae4319b85f2f442489988d523bf92e2a9d23a6051ee693cd4bcfbc67947e8028c59906ad3e537578daf5caee8a6f16 WHIRLPOOL 1132081b63b1e0e1a9342d59493ebfe1d918133a4091e48c42dae7845dcaa24a0b8e7a1183d5a41b0173c3f6dbc17838a9b7a6297fc8ea0775ab150a22ae3151
 AUX samba4.initd 657 SHA256 4c8d1ecf42d58bfa1a2087ba9da55ed410ad238a0050272cb84c2e8d50b034d9 SHA512 3373f2ad30938dd8c2d68d19af4e248470e0b6d749b53257c97d3a0792df54f9ad61a33175ae3e576b728cc11a6ae5fd8803c22188382c7b50ca041b98b84ce7 WHIRLPOOL 25f6a313323b3076ad2a5ff733b1ed4bae1833bf5d4d1aaf9c75449e578ca479998b526a1fdfefbe5d5436c94cbcf6b38934bda1ddff8587f8820a2ccb5ce1e9
@@ -45,9 +46,7 @@ DIST samba-3.6.19.tar.gz 34115773 SHA256 addecc6acb05d3ffd0934f7f91d8e83852705b9
 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.14.tar.gz 22108111 SHA256 0f9796579246ac57fd2d9bfd2be1fe2ed5aaccbce1098c03eb528570286636a6 SHA512 651ad1e40b0206390d59ea2dee49fd6769d361a69f3b37683e0ea46c6d0454776c6ea092a063428ee558a6988f5e75a723296253d97cde3d5430b7c843bef7cb WHIRLPOOL 88704645dfe8e4802bc03c07d6029ad3b7a5c59d1705ed7b3e6ea2c2127bc63c195ab1a8a64240dbe5696dba60e94f4027ef8e40ab53b24949b76a0f0fb6cf98
 DIST samba-4.0.15.tar.gz 22114484 SHA256 2866aee5ab46a57cff9838b25e6960b3ca75218195eeff0823ed72b5dfd464b2 SHA512 a98c42fe07e26f7dd12d364e279d591216cbfb0dc53e41448d4e60482a8af13e8900573926c496be081b057672e82fa1ad983f1a2e02046b749c6ea37942c365 WHIRLPOOL 8846be2a562716c29522cb839549d5e68297b636a7c1c08a99fe6a33fa0d0983da0c4b2d83555cae93e90792af46b13425b03feef38fa8e6ed4d8360db327fed
-DIST samba-4.1.4.tar.gz 23169480 SHA256 1733e1aaa37b4fcb0fc781b07fc6f20831023ce971d8bcd97940c3fbe35766a7 SHA512 a7cc48e00af6637fd464ce8e364b887155fa4ae4e1f6f1c6a0262d38a9c9a35711cb248664b0f81f356ca6afaf0ad44cba6d465207feaf86cde7c4c35e57b596 WHIRLPOOL adbf19246ca216f807ae17c8aa2a3626e81437f11f570d406d3099d6a3606417423e6a36d730aa90619ff18208207e7ca8b13475429ae98a2e47132ffe5620a1
 DIST samba-4.1.5.tar.gz 23177512 SHA256 d98c1554d6f857053557ff024c243df5d15dd9ca436d5804be4b0546ede94cc8 SHA512 28226cc3e5381dd6c3a6c28c4efbbb68d8df9127903b1976f4cd7f80dc5ad14109e5d6ebb80a3c918d711cbe2f02a01d4d2375895b16f0bc3d0c6ae4fad2de4f WHIRLPOOL 17e84c523ceb2b2fec6b32b8dceea87500e6af6518457462ac72b61ddb6a10a706703335812dbcba2f17fdcc3f4c679150396d8bd624b86c930b9faa1a317d47
 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
@@ -56,29 +55,25 @@ EBUILD samba-3.6.19.ebuild 12764 SHA256 4c48786cedfe51b1cf7e0033011029c89e6ad511
 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.14.ebuild 4766 SHA256 0412569844242b62264e0a4618fdda81a812dab15f03316f4bd678deedbe4ef9 SHA512 8d4ed387dc01015e37af5726873cc550e11ceb90b0262f3d3759255505f5fbe1ec3ec12802e42d157ab9be89e3eb45b59163e82cc2a8ae274eb3d7784b8ccc4b WHIRLPOOL 48ce7f0b7e497d1b9531148774f8e812eee57914ad4865e98deea318bb0cf3a23ce8dd4bd0e9a07d34642b75891f6fd2457399ec7b1a0632eb519a5f8292b440
-EBUILD samba-4.0.15.ebuild 4766 SHA256 10e891ecb6d11a443544df7fa84a25e09b162538e0847c7ed95855521b461ba1 SHA512 1b51255906c407b4da1fab18db432c7c2d5ca91b960fa647f1c5f8b87332080cb9161d150849ac035796001dcabf46b8e0b78069c5b0098cf9d88ae8f09f15fd WHIRLPOOL 63b481bea57f8ebdc98db93e4307199927deebec7e756813dcd530fc77f7038803ae027d6fa0ac93c667d74d33d42f43b6e8dd0820a4fcf21b1ce27df577003f
-EBUILD samba-4.1.4.ebuild 4647 SHA256 85e59c493a0e90924b5706ed176dbb5b55dc5480100910af657f8b446e7e832e SHA512 99dcf7e0468fe8429b4c10b5798c957a734ac9eda9cd43e4f4f8313e7fbc4a11581206237009370bee1f3939d3f25e1d8ea40eb704d977cfb712eecc38843059 WHIRLPOOL 8d17755934e18b5e5ad2802bdfd862a6352341bf4b75290b175c2a3fb87676ea3ba2b8ad3e2962857c70ea97c281bd4df9a553e03c69d457b3e239bf90c3174b
-EBUILD samba-4.1.5.ebuild 4684 SHA256 a927f2813ea622d2c997b5b1d0c602f221543a0218e6216696786f718c9888ec SHA512 c03a5fe4515c99905881b634b21e1d0f8857299f6b2f1207ae0c58aa73898e1cf68f3a0b592f9b60f492068d4ef36805fb1967757bde46360a6f02dc25cdca81 WHIRLPOOL 9c6a3126dedc9b94fb060467eb01baa6cc0fdf2b4e9ed8cfca09de7a42807256b14ecc86099c9c65867738892d02d5a58ba0d140ea8fd56c02dc99dc228f133d
-MISC ChangeLog 1283 SHA256 f831f9665ab6e6901919e94c13f2d9d03385e38dbcf872712142c60c6e5d51ce SHA512 cb3edcc05ab60694de81ea76b960d305262aa0732a43af1ebb7e8407ff60f5ca979d98f9091d86cd2d4dd8d40f1f4a8308bca21135e86160a497619defedf285 WHIRLPOOL aed7fa9f7393396bbdc8e2539044a6defa4f17c219ffe11b8dea06057fb53d74794405f6068cf4191196173e7f4408c0cf573aa46cde1fde0224f5f8ad7997ae
+EBUILD samba-4.0.15-r1.ebuild 4866 SHA256 ce03d845a70c61247e684a27bfa137c1ebca92e3fda85a5c318abf8c75d09d87 SHA512 d6acccbf9ebcd73c0f170c5d2c2d7e5eedb9eefda991da54640197541325b54c69744b810609642514037bbf725f983c30db277358d18aa962f37a69f5e66e79 WHIRLPOOL eeefcb2cc5782a1363ee84b41923d25e617da8940752f0ee5354cb20f7ffa43be1b8e61bd2be4724b3a14a9862df6627b7083b0f1a434f65b017deead3a4f21e
+EBUILD samba-4.1.5-r1.ebuild 4747 SHA256 a36f5cd328fc159814cf16188a2bf32aeddfd7469e90b911bab91aba42877149 SHA512 df512e7d9c57a89f5166354bda6e5b5bb3c4505c1230e115cd976a1232c8346e228da089e0dafee2f4209ac9bee6b85d066f02bdad1ec8c33299f660cbe9fb6e WHIRLPOOL 517bc178a1143d8cb272c475bc3b9a3e671d5cc8b4d27da97cabaa21b7fe08532412829a8491a2e0d6a73f4bbc072116bf15d92cfec175958706d5dd57437cc0
+MISC ChangeLog 1683 SHA256 86b6079bb80badb840bcc38a5465ef598a5c878a17139188a3a86ea530929f41 SHA512 c8dc5e6075f533477ddc4547148113f4b270792ea23cddbb23c50ee6c10133a0fd3fd1904664c9e379837574ae7998b70fa728c405aa275a5f58958947891a25 WHIRLPOOL 6346652d3a00210e0cd2810a7d1643817985acb172df313d047e605e9338856643622f113625b091226433fb9d7ba48acce3b8938c430fb51f51095a8fb55411
 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)
 
-iQJ8BAEBCABmBQJTEmBTXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOES0P/RpOuk6PQ1wkzwmuH3yY3sBT
-m7VZpnRUeW7JxTyizxE6C40zD7NWxHRlgoi/qKYJGOoaEa2vR9+TTlUH+QkIbhIY
-5QQhfA717K6CGWD9c5XOvBYdSsC+aPBLDjQcHF2tFoaRcDLPrMOaBgI7T4n+qiMM
-LGftFJ7IZVtc2Lw6SqNgpvu+hPMLOe6/CzRt2mnE6GdFGoMoaYeiJBSRg1TNU8JI
-yy67+hBj+3WcA35+hFxh92bZrHIs7NpLTEbIBKS2FxkfeO4oNXaxJ+gh3YiqsYi+
-DkPbri7RK6zzv9UUVAWthog8t46yS7y00Cgu9PJsPrJwHIwwCIhUZhvrpd6i/j7Y
-rO9ZXg9izVDurXc0PR/qhT9T46HAnVoX0bXPuIpSMr2IRLWpicuk491zCTnkD+rG
-+0s632+FwUWx3o4aLZ9OEMH2gmBOHVjQvpaONTfw83S1BcPWDSePErZ+pbUvEBhN
-muzNo76TvXJin+WmyR650s6vAgPyZd+btukd+zptOkWZDJz+OF9KKOXE/ZTPtyW/
-XAgYve5ulGPbiSiTMiAVOz7BGN/duEsUw9D35dLdDhEUYQN2POOtTxCYKqy3A52C
-NkG4cc7XEVi6km4X5hoyGyhNXUuVZn/8P16BkphSqrvSLWYOvKEQcw4cglEHL28d
-fzTtRFX3qetRr6BUD9FL
-=uezT
+iQIcBAEBCAAGBQJTGEFYAAoJEPiazRVxLXTF5VwP/Rusis+RnCIa5XLgGDhk+DZ9
+yNbrJTqLT1ZowhL3t42MYljeLPjEaO69Gcu054nvTEqtjltCUV/lEpJtnJ6PYLW5
+vQXe32UqfWVCZel36CXI3r4ceKZUSAkn09xB+ibSOaHiwYepKjarbrKUJ/s3k7jE
+cXegOawCPbCj+3fHz3A/hKBjxwbF04CTbwPK8EQjPqYjwvI5FaFB5Ml38b8hsyBU
+EV9zfDjb3JpXcnmM3qR80Rv86KLtwqyUIfP7Q6FaAdjbc8OU4Sbx+9eQhBaZ+8ed
+MR9PmzLOMn9NxbQPKRKeT/q/10g+3cv1r00I1cULgcyz/l5iR1eI5WnSaDpGJIVx
+gvICFg27CwCzYbWmirK5n7UCDFplO8ZawfGqoVNv/oyrPxx7IeefYxEbE8Py/X+V
+PvudioVHwn5+0uIfhQqWDlBqTOeg6LcAgSYHmuUrCyp5l78nXpn0U6JYm4czI69Q
+2igLVRyOpUQu/h8nr8b5VlsGEf7zC7M6ZaDbP0kqwSCO0876mnyFI5Xp7obZFqW0
+0Gig5vpAuYYf7WvQGI708v1IApZqeoFAoO4uoxrikUQB/7w+proJDEljOa3eX4iw
+46ZtZpG3Wf+250tOp5PB1MsK7v9eRELzyyxjh0bfnz8aogPxtDgaj0l9rSCii6z9
+SbSpLosKY4mKQOEjKata
+=yV1n
 -----END PGP SIGNATURE-----
diff --git a/net-fs/samba/files/samba-4.x-readline63_typedef_fix.patch b/net-fs/samba/files/samba-4.x-readline63_typedef_fix.patch
new file mode 100644
index 000000000000..0dcb1cfe941a
--- /dev/null
+++ b/net-fs/samba/files/samba-4.x-readline63_typedef_fix.patch
@@ -0,0 +1,26 @@
+Function, CPFunction, CPPFunction and VFunction typedefs are considered
+old-style (deprecated) starting from readline 4.2.
+Compatibility typedefs have been in place up to readline 6.2 but were
+removed with the 6.3 release thus causing builds to break.
+Swtich to the new-style specific prototyped typedef.
+
+Signed-off-by: Gustavo Zacarias <gustavo at zacarias.com.ar>
+---
+ libcli/smbreadline/smbreadline.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libcli/smbreadline/smbreadline.c b/libcli/smbreadline/smbreadline.c
+index cff25a7..80e10b0 100644
+--- a/libcli/smbreadline/smbreadline.c
++++ b/libcli/smbreadline/smbreadline.c
+@@ -141,7 +141,7 @@ char *smb_readline(const char *prompt, void (*callback)(void),
+ 
+ #if HAVE_DECL_RL_EVENT_HOOK
+ 	if (callback)
+-		rl_event_hook = (Function *)callback;
++		rl_event_hook = (rl_hook_func_t *)callback;
+ #endif
+ 	ret = readline(prompt);
+ 	if (ret && *ret)
+-- 
+1.8.3.2
diff --git a/net-fs/samba/samba-4.0.14.ebuild b/net-fs/samba/samba-4.0.15-r1.ebuild
index f7078c130fdc..9e7545b86d39 100644
--- a/net-fs/samba/samba-4.0.14.ebuild
+++ b/net-fs/samba/samba-4.0.15-r1.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.14.ebuild,v 1.2 2014/03/01 22:33:48 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.0.15-r1.ebuild,v 1.1 2014/03/06 09:35:19 polynomial-c Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_{6,7} )
@@ -71,7 +71,11 @@ S="${WORKDIR}/${MY_P}"
 CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
 
 # sys-apps/dmapi is an automagic dependency (see bug #474492)
-PATCHES=( "${FILESDIR}/${PN}-4.1.0-remove-dmapi-automagic.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-4.1.0-remove-dmapi-automagic.patch"
+	"${FILESDIR}/named.conf.dlz.patch"
+	"${FILESDIR}/${PN}-4.x-readline63_typedef_fix.patch"
+)
 
 WAF_BINARY="${S}/buildtools/bin/waf"
 
diff --git a/net-fs/samba/samba-4.0.15.ebuild b/net-fs/samba/samba-4.0.15.ebuild
deleted file mode 100644
index 9e08ca63160b..000000000000
--- a/net-fs/samba/samba-4.0.15.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# 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.ebuild,v 1.2 2014/03/01 22:33:48 mgorny Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python2_{6,7} )
-
-inherit python-r1 waf-utils multilib linux-info systemd
-
-MY_PV="${PV/_rc/rc}"
-MY_P="${PN}-${MY_PV}"
-
-if [ "${PV}" = "4.9999" ]; then
-	EGIT_REPO_URI="git://git.samba.org/samba.git"
-	KEYWORDS=""
-	inherit git-2
-else
-	SRC_URI="mirror://samba/stable/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~hppa ~x86"
-fi
-
-DESCRIPTION="Samba Suite Version 4"
-HOMEPAGE="http://www.samba.org/"
-LICENSE="GPL-3"
-
-SLOT="0"
-
-IUSE="acl addns ads aio avahi client cluster cups dmapi fam gnutls iprint
-ldap quota selinux swat syslog test winbind"
-
-# sys-apps/attr is an automagic dependency (see bug #489748)
-# dev-libs/libaio is an automagic dependency (see bug #489764)
-# sys-libs/pam is an automagic dependency (see bug #489770)
-CDEPEND="${PYTHON_DEPS}
-	>=app-crypt/heimdal-1.5[-ssl]
-	dev-libs/iniparser
-	dev-libs/libaio
-	dev-libs/popt
-	sys-libs/readline
-	virtual/libiconv
-	dev-python/subunit
-	sys-apps/attr
-	sys-libs/libcap
-	>=sys-libs/ldb-1.1.16
-	>=sys-libs/tdb-1.2.11[python]
-	>=sys-libs/talloc-2.0.8[python]
-	>=sys-libs/tevent-0.9.18
-	sys-libs/zlib
-	virtual/pam
-	acl? ( virtual/acl )
-	addns? ( net-dns/bind-tools[gssapi] )
-	cluster? ( >=dev-db/ctdb-1.0.114_p1 )
-	cups? ( net-print/cups )
-	dmapi? ( sys-apps/dmapi )
-	fam? ( virtual/fam )
-	gnutls? ( dev-libs/libgcrypt:0
-		>=net-libs/gnutls-1.4.0 )
-	ldap? ( net-nds/openldap )
-	selinux? ( sec-policy/selinux-samba )"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	client? ( net-fs/cifs-utils[ads?] )"
-
-REQUIRED_USE="ads? ( acl ldap )"
-
-RESTRICT="mirror"
-
-S="${WORKDIR}/${MY_P}"
-
-CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
-
-# sys-apps/dmapi is an automagic dependency (see bug #474492)
-PATCHES=( "${FILESDIR}/${PN}-4.1.0-remove-dmapi-automagic.patch" )
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-pkg_setup() {
-	python_export_best
-	if use aio; then
-		if ! linux_config_exists || ! linux_chkconfig_present AIO; then
-				ewarn "You must enable AIO support in your kernel config, "
-				ewarn "to be able to support asynchronous I/O. "
-				ewarn "You can find it at"
-				ewarn
-				ewarn "General Support"
-				ewarn " Enable AIO support "
-				ewarn
-				ewarn "and recompile your kernel..."
-		fi
-	fi
-}
-
-src_configure() {
-	local myconf=''
-	use "cluster" && myconf+=" --with-ctdb-dir=/usr"
-	use "test" && myconf+=" --enable-selftest"
-	myconf="${myconf} \
-		--enable-fhs \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
-		--with-modulesdir=/usr/$(get_libdir)/samba \
-		--with-pammodulesdir=/$(get_libdir)/security \
-		--with-piddir=/run/${PN} \
-		--disable-rpath \
-		--disable-rpath-install \
-		--nopyc \
-		--nopyo \
-		--disable-ntdb \
-		--bundled-libraries=NONE \
-		--builtin-libraries=NONE \
-		$(use_with addns dnsupdate) \
-		$(use_with acl acl-support) \
-		$(use_with ads) \
-		$(use_with aio aio-support) \
-		$(use_enable avahi) \
-		$(use_with cluster cluster-support) \
-		$(use_enable cups) \
-		$(use_with dmapi) \
-		$(use_with fam) \
-		$(use_enable gnutls) \
-		$(use_enable iprint) \
-		$(use_with ldap) \
-		--with-pam \
-		--with-pam_smbpass \
-		$(use_with quota quotas) \
-		$(use_with syslog) \
-		$(use_with swat) \
-		$(use_with winbind)
-		"
-	use "ads" && myconf+=" --with-shared-modules=idmap_ad"
-
-	CPPFLAGS="-I/usr/include/et ${CPPFLAGS}" \
-		waf-utils_src_configure ${myconf}
-}
-
-src_install() {
-	waf-utils_src_install
-
-	# install ldap schema for server (bug #491002)
-	if use ldap ; then
-		insinto /etc/openldap/schema
-		doins examples/LDAP/samba.schema
-	fi
-
-	# Make all .so files executable
-	find "${D}" -type f -name "*.so" -exec chmod +x {} +
-
-	# Install init script and conf.d file
-	newinitd "${CONFDIR}/samba4.initd-r1" samba
-	newconfd "${CONFDIR}/samba4.confd" samba
-
-	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
-}
-
-src_test() {
-	"${WAF_BINARY}" test || die "test failed"
-}
-
-pkg_postinst() {
-	elog "This is is the first stable release of Samba 4.0"
-
-	ewarn "Be aware the this release contains the best of all of Samba's"
-	ewarn "technology parts, both a file server (that you can reasonably expect"
-	ewarn "to upgrade existing Samba 3.x releases to) and the AD domain"
-	ewarn "controller work previously known as 'samba4'."
-
-	elog "For further information and migration steps make sure to read "
-	elog "http://samba.org/samba/history/${P}.html "
-	elog "http://samba.org/samba/history/${PN}-4.0.0.html and"
-	elog "http://wiki.samba.org/index.php/Samba4/HOWTO "
-}
diff --git a/net-fs/samba/samba-4.1.4.ebuild b/net-fs/samba/samba-4.1.4.ebuild
deleted file mode 100644
index 6a4edb56a5ab..000000000000
--- a/net-fs/samba/samba-4.1.4.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# 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.4.ebuild,v 1.2 2014/03/01 22:33:48 mgorny Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python2_{6,7} )
-
-inherit python-r1 waf-utils multilib linux-info systemd
-
-MY_PV="${PV/_rc/rc}"
-MY_P="${PN}-${MY_PV}"
-
-SRC_URI="mirror://samba/stable/${MY_P}.tar.gz"
-KEYWORDS="~amd64 ~hppa ~x86"
-
-DESCRIPTION="Samba Suite Version 4"
-HOMEPAGE="http://www.samba.org/"
-LICENSE="GPL-3"
-
-SLOT="0"
-
-IUSE="acl addns ads aio avahi client cluster cups dmapi fam gnutls iprint
-ldap quota selinux syslog test winbind"
-
-# sys-apps/attr is an automagic dependency (see bug #489748)
-# dev-libs/libaio is an automagic dependency (see bug #489764)
-# sys-libs/pam is an automagic dependency (see bug #489770)
-CDEPEND="${PYTHON_DEPS}
-	>=app-crypt/heimdal-1.5[-ssl]
-	dev-libs/iniparser
-	dev-libs/libaio
-	dev-libs/popt
-	sys-libs/readline
-	virtual/libiconv
-	dev-python/subunit
-	sys-apps/attr
-	sys-libs/libcap
-	>=sys-libs/ldb-1.1.16
-	>=sys-libs/tdb-1.2.11[python]
-	>=sys-libs/talloc-2.0.8[python]
-	>=sys-libs/tevent-0.9.18
-	sys-libs/zlib
-	virtual/pam
-	acl? ( virtual/acl )
-	addns? ( net-dns/bind-tools[gssapi] )
-	cluster? ( >=dev-db/ctdb-1.0.114_p1 )
-	cups? ( net-print/cups )
-	dmapi? ( sys-apps/dmapi )
-	fam? ( virtual/fam )
-	gnutls? ( dev-libs/libgcrypt:0
-		>=net-libs/gnutls-1.4.0 )
-	ldap? ( net-nds/openldap )
-	selinux? ( sec-policy/selinux-samba )"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	client? ( net-fs/cifs-utils[ads?] )"
-
-REQUIRED_USE="ads? ( acl ldap )"
-
-RESTRICT="mirror"
-
-S="${WORKDIR}/${MY_P}"
-
-CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
-
-# sys-apps/dmapi is an automagic dependency (see bug #474492)
-PATCHES=( "${FILESDIR}/${PN}-4.1.0-remove-dmapi-automagic.patch" )
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-pkg_setup() {
-	python_export_best
-	if use aio; then
-		if ! linux_config_exists || ! linux_chkconfig_present AIO; then
-				ewarn "You must enable AIO support in your kernel config, "
-				ewarn "to be able to support asynchronous I/O. "
-				ewarn "You can find it at"
-				ewarn
-				ewarn "General Support"
-				ewarn " Enable AIO support "
-				ewarn
-				ewarn "and recompile your kernel..."
-		fi
-	fi
-}
-
-src_configure() {
-	local myconf=''
-	use "cluster" && myconf+=" --with-ctdb-dir=/usr"
-	use "test" && myconf+=" --enable-selftest"
-	myconf="${myconf} \
-		--enable-fhs \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
-		--with-modulesdir=/usr/$(get_libdir)/samba \
-		--with-pammodulesdir=/$(get_libdir)/security \
-		--with-piddir=/run/${PN} \
-		--disable-rpath \
-		--disable-rpath-install \
-		--nopyc \
-		--nopyo \
-		--bundled-libraries=ntdb \
-		--builtin-libraries=ntdb \
-		$(use_with addns dnsupdate) \
-		$(use_with acl acl-support) \
-		$(use_with ads) \
-		$(use_with aio aio-support) \
-		$(use_enable avahi) \
-		$(use_with cluster cluster-support) \
-		$(use_enable cups) \
-		$(use_with dmapi) \
-		$(use_with fam) \
-		$(use_enable gnutls) \
-		$(use_enable iprint) \
-		$(use_with ldap) \
-		--with-pam \
-		--with-pam_smbpass \
-		$(use_with quota quotas) \
-		$(use_with syslog) \
-		$(use_with winbind)
-		"
-	use "ads" && myconf+=" --with-shared-modules=idmap_ad"
-
-	CPPFLAGS="-I/usr/include/et ${CPPFLAGS}" \
-		waf-utils_src_configure ${myconf}
-}
-
-src_install() {
-	waf-utils_src_install
-
-	# install ldap schema for server (bug #491002)
-	if use ldap ; then
-		insinto /etc/openldap/schema
-		doins examples/LDAP/samba.schema
-	fi
-
-	# Make all .so files executable
-	find "${D}" -type f -name "*.so" -exec chmod +x {} +
-
-	# Install init script and conf.d file
-	newinitd "${CONFDIR}/samba4.initd-r1" samba
-	newconfd "${CONFDIR}/samba4.confd" samba
-
-	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
-	systemd_dounit "${FILESDIR}"/samba.service
-}
-
-src_test() {
-	"${WAF_BINARY}" test || die "test failed"
-}
-
-pkg_postinst() {
-	elog "This is is the first stable release of Samba 4.0"
-
-	ewarn "Be aware the this release contains the best of all of Samba's"
-	ewarn "technology parts, both a file server (that you can reasonably expect"
-	ewarn "to upgrade existing Samba 3.x releases to) and the AD domain"
-	ewarn "controller work previously known as 'samba4'."
-
-	elog "For further information and migration steps make sure to read "
-	elog "http://samba.org/samba/history/${P}.html "
-	elog "http://samba.org/samba/history/${PN}-4.0.0.html and"
-	elog "http://wiki.samba.org/index.php/Samba4/HOWTO "
-}
diff --git a/net-fs/samba/samba-4.1.5.ebuild b/net-fs/samba/samba-4.1.5-r1.ebuild
index 63a99935751c..5e25e50df16f 100644
--- a/net-fs/samba/samba-4.1.5.ebuild
+++ b/net-fs/samba/samba-4.1.5-r1.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.ebuild,v 1.2 2014/03/01 22:33:48 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.1.5-r1.ebuild,v 1.1 2014/03/06 09:35:19 polynomial-c Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_{6,7} )
@@ -68,6 +68,7 @@ CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
 PATCHES=(
 	"${FILESDIR}/${PN}-4.1.0-remove-dmapi-automagic.patch"
 	"${FILESDIR}/named.conf.dlz.patch"
+	"${FILESDIR}/${PN}-4.x-readline63_typedef_fix.patch"
 )
 
 WAF_BINARY="${S}/buildtools/bin/waf"