Security bump (bug #511764). Removed old

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

7 files changed, 516 insertions, 383 deletions

diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog
index 7a4b0f35a8c9..2140d611937d 100644
--- a/net-fs/samba/ChangeLog
+++ b/net-fs/samba/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-fs/samba
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.708 2015/02/19 09:43:23 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.709 2015/02/23 22:43:37 polynomial-c Exp $
+
+*samba-4.1.17 (23 Feb 2015)
+*samba-4.0.25 (23 Feb 2015)
+*samba-3.6.25 (23 Feb 2015)
+
+  23 Feb 2015; Lars Wendler <polynomial-c@gentoo.org> +samba-3.6.25.ebuild,
+  -samba-4.0.23.ebuild, -samba-4.0.24.ebuild, +samba-4.0.25.ebuild,
+  -samba-4.1.15.ebuild, -samba-4.1.16.ebuild, +samba-4.1.17.ebuild:
+  Security bump (bug #511764). Removed old.
 
 *samba-4.1.16 (19 Feb 2015)
 
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 5af27a47967c..7432e1b3058f 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -43,35 +43,33 @@ AUX winbindd.service 240 SHA256 755036bc419cce90200ac3c04986fbb7cf718c128c2a1288
 DIST samba-3.5.21.tar.gz 35377315 SHA256 fd9a66056b1ba9496762394efff41fcaa0e58f2e50e71910e6d202b8a59a1c10 SHA512 e6d52530094b2f8284f8536f97411c3944a83e9f1a808836acdca19fe4aee3cc47e136cc2a2eab96ba89526fe289ec1a3d22fb836bd261bf7c8ddfbccd1cf975 WHIRLPOOL a476ea24841cfdec0f640880e0362173a3f6b957afd2d2448f7b4a8b7c927ef558fd22e7fe20b05bd8aecf1169d8e488b87830a99ddfddcbc8be0c9a414966ad
 DIST samba-3.5.22.tar.gz 35385144 SHA256 b4c98f77f5634478da109063334acd9b6ad7bcb38151a5b1cac6dc5feb6679dc SHA512 0e1b4816d921ca82f0426a254cf103066634cc54e28d707a62da951118413f7f5ca5f87d60688cab802a58b0af87f797fbbe12f4e1284d5d7f545a98aba97616 WHIRLPOOL 6e59655dd7a537f0c7c889c43ddf5afb8060706e1ec79b3835698181c5c7478059f91c93eefbde50b03e0154a686eda35eabf807bb7ae01dd2b9b39648a009ae
 DIST samba-3.6.24.tar.gz 34122116 SHA256 11d0bd04b734731970259efc6692b8e749ff671a9b56d8cc5fa98c192ab234a7 SHA512 40f054ab0e1ef07fa4bb4934229c42eb0e484596c4d4b81edbf43951acd56e7b04b6efb17e6cb269b329f1a84d60cbe10a3ff04e86c1983ec603bdcf7fc7ecbb WHIRLPOOL e98d3ae62e5d57e5d16b320213961ba7221b8b38912b90434296323549e1673f25682ec8da469dd771d68ec222a6be7d30e24224e0cde0d9dc1e9c393590c68a
-DIST samba-4.0.23.tar.gz 22140738 SHA256 47d7b9d0caf76ea111794c6181db2fed5c15fd496a5a9eaa8ed4323302c72118 SHA512 49a6889ce3124be0d12df75d30837dde63605d706a34e9017d6e8e365e97910d75bad3eef28296030fdbb013074b68e5e89ad73e3a73806b38e94d306104d711 WHIRLPOOL 99ba11be30df2ce3f9e8af144d435e6b152d657957241043082dc699b90a8352998f5f1b32e810ed8e8e4853fb39792d68a92d97a12d97e3edec65c54b611fab
-DIST samba-4.0.24.tar.gz 22148369 SHA256 e1e4068c65684848d8cb17c8997c91be426ff75ccd617f647878307817af615a SHA512 927f57e1bd5b1744ce4bfbcc023989130d176901bd854b88a6c0d761cd29b1ba8b15f0a71cc70bf663105b5e5afb47ce8935181f269d1e0d9444dd2f9f011616 WHIRLPOOL 8dfc8cf16b25660df6b889b96bcc0058abed52cfac0d2d990373ca70aaddd680b6e58cccbc0c68ffaa2eab413386e3ea3632fa807393b1452752da601bd8dbf4
-DIST samba-4.1.15.tar.gz 19530544 SHA256 9d84112124512428ddc9cc0d9975524bab730b9a598a9ff90458666afb3f42f4 SHA512 7ea71e0083aa487ce7942b11496aa3d6a2d9b47759e9b387f9703ae99aacf96d4350dbaa05a64a124c12fcc97a7b232387710667a19b1e03b6a7c7b5a360f011 WHIRLPOOL 5dd14a65e368cff52c7ece83f5751757901ca8c8aeb52f519d254d8e7bf6feef336abc37ab502ac90b1e12b2976c05077eefb0d1bb3a8ca7e4848a5f5030fb27
-DIST samba-4.1.16.tar.gz 19534236 SHA256 12a09c167bfa25f50b82775bcbeda94c71c5d71d3b0d1210f6dae0f23020a87b SHA512 78ed60432262eb468ba87fea1202603e13e996181015f42d6b45b40f4b181e64283365c36faf70be60cc6fddd28c88365c22dc286785815e1108a1239d34cf98 WHIRLPOOL d6eeab6a9d4d25ad5be2f8f3a01721bdb53bf87498a448a416de7c4f9663811a6ce332164362f9d9bf206bb1bd6d977b047d9829052420370bf285ce93e76630
+DIST samba-3.6.25.tar.gz 34121828 SHA256 8f2c8a7f2bd89b0dfd228ed917815852f7c625b2bc0936304ac3ed63aaf83751 SHA512 25a5c56dae4517e82e196b59fa301b661ec75db57effbb0ede35fb23b018f78cdea6513e8760966caf58abc43335fcebda77fe5bf5bb9d4b27fd3ca6e5a3b626 WHIRLPOOL 68c4a335b3912bf3c6baecae337b1131127515191052366ca9a04ec6d919f2fb69c912aefb087e2578134f3a9bde7b496ea880f2197a8dbf8221058dd1e8444d
+DIST samba-4.0.25.tar.gz 22150978 SHA256 e6a07940a658b81d368fc7ed8e5068bd27188996d73dee1cea9755682cb9a485 SHA512 ff8ae7a87c41b8b31ec5069b733b9aec4dffb082ffaa71f33cd031ac8b3e8b5ddef7e579048beb1fc7154f050347d80949cd662c08513a8e0bb6ee9baa84c32c WHIRLPOOL e215b604571feeffa8e52520753769a9a71a339f3c88fd30046bbf8a2b2cdd52b2fd8eac3f911a25fe607667e105aba2b72447d2c4195a5d465101a230bd62d0
+DIST samba-4.1.17.tar.gz 19536407 SHA256 7aeb5d09e9c84bbeeb4b98d33404e9dbc4d99c54e64a447cc9c4d57e9255cb1d SHA512 19fa34521d3d520784d1eb85b4844fa59bf12468bf96b174b952eb63b6645a9eefb9044416829ffbe7a6a57abd28a227d1d57e1567cd46a1495c05a865ae75d5 WHIRLPOOL 1784c0db382e0940acc9fc1c1a0a2274b852bfdf2bf47604af4a253302ff95e2e43ad27e3b73afd8e4efb9fbefd4519b4e9b91bde79ac615881d6ae3f0f354a2
 DIST smb_traffic_analyzer_v2.diff.bz2 12226 SHA256 1bae7eafbe8ac2382313d5ab9d43d73ba64b63a714f0f588516952d476fb868d SHA512 aa0e457a0dd282e61e6dfcd5705c29b319832dca9711b1b5baf8373e2f079991399c3537c050219ccb861a93f86353ebff677a5c625d2e3f1f3a13ee5c4087d0 WHIRLPOOL 85ee72a360f67ebe71be5cd400ecd635280a0d7c64ebb8b94656a5ef1a94f74a987de86408af00ce1b81cc8363b1b3cf14726860d29b72ee610d4bab73d6b139
 EBUILD samba-3.5.21.ebuild 12311 SHA256 2a849451f886614315680b28b944840d1c670a2b878329773de63a72797a6fa1 SHA512 5006f1afdc2df93f317d15e1e9781bee20eb0e17e4a15892cb5ebe8bb2ab0a7a56bbbf2ed67099620391eda14b53a8fdb78a5ee9634a489915fcf84b031704b7 WHIRLPOOL a295b28990480ed3e13cf76d4f04270739b2669837d5ea93691888c488ee10dad22cd4bcc2037b09e66be41eda4d3d2e064e28701acb1f2dc7acf80935283123
 EBUILD samba-3.5.22.ebuild 12309 SHA256 dc195567858dc0c11b2b86fc42427e1066c5efeef29bfe047bdbac413a62007d SHA512 82125fe1d5ba33f57ca06e513090eb0f2cedcda3242773b8734b4b0a18c68ab12f9149651908ddffbe3b2687b9876491a6cbbee7dc4f1e0584a5eef218ff8a57 WHIRLPOOL 9e87a5fb631fd519c2fc89da8a1a591fc9a4eb58eee63052f09321a6f115dbd82e8dd383843b6e6feffe68edaacb4de5c6ba6e9e66a098fa0cddc480988776c8
 EBUILD samba-3.6.24.ebuild 13517 SHA256 34686659fa4f283611d0469bf778aed6160a79100745dee23e05f14a13021db8 SHA512 3a614416b770a1ff19e1ccf604b2b6e7a8777c73cf662ddd9606e34125187a5e681774ee496b5de44f36e99973c906da019fbec6a17534859972884c3be1618c WHIRLPOOL 78dca5f9e07afb61308b40a3da1a6fcfea80969d6f08098b2b66bd5fceb4d84f77d8fcb939e0fcf64c94efa43640c973b01b416f191e17011d2fb9c8de584ebd
-EBUILD samba-4.0.23.ebuild 4865 SHA256 dead19aa152bf9f217914618bdbb1b0a5d1a7357cf5a655496e5c7439fa73c22 SHA512 0b58d4826b29d158901985396c11ce0cf545fbfd43fb4bf5b80a43afff3427707bfecd59585f7f15bce8677ef0fc8dd6176f12cc210c831efb6d2a78f3521c0e WHIRLPOOL 7d49a8459b97f3370b32b12c85e0e026cbf5baa62ea15e6a6cfde6b180f59d32f3407186e46fcc1596c62248744b789671e09477b478f84554c15ef846028207
-EBUILD samba-4.0.24.ebuild 4871 SHA256 9edd97eb7eccc6bcbb7bb5f1c8a2ece88c01b2209af91d2fbef0796884737bd5 SHA512 87a9a8009a643d929d84c7c510fa869c38f4cbddca3b33f7aa8b0095b8a53db0af113059a33786338032d027efe16cbae0f3b70a79691260325f12e140aaf225 WHIRLPOOL e6100b2620cabc27cf6833fa7949598d33a3263dc45904a4167ee24780525dede9fc88bec616c3e5062ab4b8c4698cfc38432a9544e3749bd1b653cc253e0943
-EBUILD samba-4.1.15.ebuild 4869 SHA256 2a76ce14ea19f1212248b10b3f89adbe0d7707314e8fa657259648b9252321ca SHA512 a2a0687de82606a9c9bf2cf3fa12f262ba4ca9e5b855e87b595ed781b49b92344fb759682f5e2851c43bce5bb89fcb0b5238aa3356b70fce34f856a97b7e6aba WHIRLPOOL 669939ac3cc8a629fd822504d48053606ec68c2293b36a266d76edb0a52b7f7b01b54838ad74e543515b52d31e1191ef0da7d3aad98627c74dd45b02943213e1
-EBUILD samba-4.1.16.ebuild 4871 SHA256 5d944b3b96dc8cb8583f73a7ffe55f421238e31f1f92ae76d8a12a817f1a65b7 SHA512 2c3c5309123be2fd6069ae7c38eba3eab6a0dd59e52f05b824cc1fa323a10cff58b07ef8978ccbbda13d1796f338addcfc626910f5edf3bbedbe05c95b82d9a3 WHIRLPOOL 3db9f0c57807929e87e8d1673a5de65a48657090559ea74dcc967f969a01c4162eaeb2715afb80c2c905a2da27d74e9d0f388dfb6e51708f1c7e918604e05755
-MISC ChangeLog 9453 SHA256 91b18e1f9fee8398997381211123df7ee84cb43faf1ce0b171cecc75aecde7ed SHA512 29077d3b9c31d6fa670b712b1d0af53a2062286af82b3acdd8938fd82a0fdd88b84b899ce3f56d972e871743408ecc4c24d57639bbac9d3879c5a8e106f54584 WHIRLPOOL 9690d1b1de529e2cb4e9e3fcce8aa004f867ee42ca1e0b7e115cbf728919c1cccb9e971faf0533b05a7944e9480306279142b899a2431c0816a2024130752d2d
+EBUILD samba-3.6.25.ebuild 13536 SHA256 c13c72126696af67e52e2d7bf9d5fc3e81d9b609bbb4af8766e0d22e7593b7d0 SHA512 c8525fdc95295b18f6df7afdbdb35c39c436bceb8454441ddd7e088bd7944f62c00ef9fa23aaed917f84f403152e36ac8e6229daffae1688248235126fa9c2e2 WHIRLPOOL 8f053ddc0eabd843514b953f7189ad3fa909aa810d69a24fbbd2b383c7c4dad72739d96b543cbaf95d25d22d41cb617297120531a96c14b3d1a52632888285f3
+EBUILD samba-4.0.25.ebuild 4873 SHA256 75b4385a15ecd85490687bae81fa46fcb3b1e78379a53a9e1a857492b371c912 SHA512 9c90b4eff6eab6ef80a1c44976c1d6f099aa34ead782e014f22dbe415f884092252812609f07c9f1b5216e0a43d9fa1f33badc0603d68b0feeb88ed60bc5dace WHIRLPOOL 648ffb43a1b5299d74c0d1d7c8608f4f78bd4144f568f5d5514568abcd7f28252330bb53b38e901fb8dbc10217c2f44e9fa4f7f9053dd57cd5ca77bb1125b0d3
+EBUILD samba-4.1.17.ebuild 4871 SHA256 aee20e9e14bf18266a904c1fa43c00ce8fb66c16970beb334a0b7f3f0430746c SHA512 9007bd0f7129ddc3c68f8ea90ee3d3c44d0d4b74135a83e8a3e1dcf527ed97b306fa53d1b78e98dcf2f36629333430ec1e5958e4d6874ec09235c780c3b8ebf0 WHIRLPOOL 062be3f18e309ef8a0cd6d0b844065bbeccfe183ee4e5794c29242adf6139c91a2c5107054334b7a5b4d010f9d4022441817256a86cc81aa54e168494fc61781
+MISC ChangeLog 9795 SHA256 5b57a7316ee229ea332f6cd1ac1ac0b6b92bd1ef4578dde104b9710cea93d5f4 SHA512 d7231390e5e564d3137320ee9a1363cb7bb538bc5dd6c0e0c18b3cf5b925cecf7e7e47495a32a2bf226a30e69c5eccdccf92ec9aae213f6085e4cbfe599c5c4f WHIRLPOOL 6fd389a22f0f5d423e2f20b713c7094dfbc4cef17a01cc8abf224598bf7268569427e7a27dfb793e161dcd9f6d50621db353c083c1385dcb626f3b82a4822336
 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
 
-iQIcBAEBCAAGBQJU5bA8AAoJEPiazRVxLXTFhFEP/0bHzDBFIfuvOt6L8Ielv/Mw
-G1nYmkVM+jEFXLZ7CiIhh0ORP/RhD6uB0PGNLaSjZQv+CjJbpXvdpcYjmvDkmV50
-g7/Kl5mwr0Z/Q77M5i5i6xNN7jtOKHA3a07EXJnh+4yRno5G549SLsz5OAtlynaw
-ha54UWoUMmuG+ydO0GlKud9WZhJBTH7Q2iohfeEiKdIaRNWiJ8V5ZNfAq90y5aZJ
-GGWUpL9AIhjNlV2e4Bj/8fm/uF999QebWiR7IovPJUu2naipmiqfeY5ABRPzvjYi
-wTpx78Y/lN3jnskczfswYljJheUWhTEy906UXjOECp6GrRzhn/dDeyLh0q4MAG/1
-e44zQ3oB7ADOzjn1T7U6Q9IkjUA4IkcPlYAEr3o1ZSL0yv86/LMIyB6Q1LHO0uDZ
-Pp0s3dVxb8lKfzYKbW61FIsJg7ls8UHVSLIWkxtI7tKbSfGmDB9LtEvxU9iYHikj
-u0Ps3XHqUmu+vDPsFMyc4Ecxx4dvb/xm5L9OfGxyAU/2/GJfkJRCiNzrDzB9uj4w
-4o7vQPiL89wLmsu1OfdKDILsmcxjrjk3w/EqDHpdyz0vY6d2LAl9nEFTkhgYfiSl
-RsuPJV9htU2dH875PUiGHcN46UgamKdkYCATKiYlANObiVzv7paVxhqboS/K00sx
-9k2FV/LLXhN/0n9RsSDw
-=xdZM
+iQIcBAEBCAAGBQJU660bAAoJEPiazRVxLXTFaB8P/Rs4/8MkAamyuxOBx73ZGrF4
+FcFXXT8YspJDyVhX7+KYvlDXuBr1GUVVexgCHIRIGd6fJrWpYKt4P7ww3QKIB0z2
+Y7M5FL0molSs6pbBbh9EqdQYjTXumnVuU88U6Mdpi01u65rrsQzCRJB8jKJXVKbg
+8WLDuyKs+7zDT+LXpix67lbv1jlnWXHyCC/9KCxLeD7jIWYQR2HCQHEtSIdP3klT
+O1LpRiHJU20TfBlF7YhMBNtNT8OcGps0yP0FTaeGNgnm+2Ov9hQVxSwnFjr2Hvr4
+/Vs2JG4znkQwYAQqAKJnJSvBzB5WqnMupac0Xh3a5MC1OE5zvLBNbg9cxDS9JMPd
+HGcMGSv+SmMlxqAj2Og7JEZjfdvZRR8Sbc6g5cuh/lhKwirqgVKOkLJJ2J5TgspA
+NYa0x4yxZH31CW7sLejpNUgFIbhncdbNNB4/Z0r5XdRqH9GNiFX6aQfW8owAt8uL
+Ks5xOXBahro85EQC509Ve4/pIq3ps2SdcpVVLZk8gdfqMiFzOfLn9/7vmvnmNYNL
+TcO/A4QjT0vvAR7hUGL94ySpThRp51f2v53632cpnPL91HZWVROVrc2Uxxse8oGO
+pt9VYjNZ35ZKwPXyiTlGDxZH53DynrrzpX/dxNsht2OfAP/SJ0HTLFP86Pgj9S82
+EL0mro9X+fZZb0EhoR4k
+=N/NR
 -----END PGP SIGNATURE-----
diff --git a/net-fs/samba/samba-3.6.25.ebuild b/net-fs/samba/samba-3.6.25.ebuild
new file mode 100644
index 000000000000..76fe6462afe7
--- /dev/null
+++ b/net-fs/samba/samba-3.6.25.ebuild
@@ -0,0 +1,483 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.6.25.ebuild,v 1.1 2015/02/23 22:43:37 polynomial-c Exp $
+
+EAPI=5
+
+inherit pam versionator multilib multilib-minimal eutils flag-o-matic systemd
+
+MY_PV=${PV/_/}
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Library bits of the samba network filesystem"
+HOMEPAGE="http://www.samba.org/"
+SRC_URI="mirror://samba/stable/${MY_P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+IUSE="acl addns ads +aio avahi caps +client cluster cups debug dmapi doc examples fam
+	ldap ldb +netapi pam quota +readline selinux +server +smbclient smbsharemodes
+	swat syslog +winbind"
+
+DEPEND="dev-libs/popt
+	>=sys-libs/talloc-2.0.8-r1[${MULTILIB_USEDEP}]
+	>=sys-libs/tdb-1.2.13[${MULTILIB_USEDEP}]
+	>=sys-libs/tevent-0.9.19[${MULTILIB_USEDEP}]
+	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
+	ads? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] sys-fs/e2fsprogs
+		client? ( sys-apps/keyutils ) )
+	avahi? ( net-dns/avahi[dbus] )
+	caps? ( >=sys-libs/libcap-2.22-r2[${MULTILIB_USEDEP}] )
+	client? ( !net-fs/mount-cifs
+		>=dev-libs/iniparser-3.1-r1[${MULTILIB_USEDEP}] )
+	cluster? ( >=dev-db/ctdb-1.13 )
+	cups? ( net-print/cups )
+	debug? ( dev-libs/dmalloc )
+	dmapi? ( sys-apps/dmapi )
+	fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] )
+	ldap? ( >=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}] )
+	ldb? ( sys-libs/ldb )
+	pam? ( >=virtual/pam-0-r1[${MULTILIB_USEDEP}]
+		winbind? ( >=dev-libs/iniparser-3.1-r1[${MULTILIB_USEDEP}] )
+	)
+	readline? ( >=sys-libs/readline-5.2:= )
+	syslog? ( virtual/logger )"
+
+RDEPEND="${DEPEND}
+	kernel_linux? ( ads? ( net-fs/cifs-utils[ads] )
+			client? ( net-fs/cifs-utils ) )
+	selinux? ( sec-policy/selinux-samba )
+"
+
+# Disable tests since we don't want to build that much here
+RESTRICT="test"
+
+SBINPROGS=""
+BINPROGS=""
+KRBPLUGIN=""
+PLUGINEXT=".so"
+SHAREDMODS=""
+
+S=${WORKDIR}/${MY_P}
+
+# 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
+			$(usex client "" "bin/smbclient")"
+
+		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' \
+		source3/configure || die "sed failed"
+	epatch "${CONFDIR}"/smb.conf.default.patch
+
+	#bug #399141 wrap newer iniparser version
+	has_version ">=dev-libs/iniparser-3.0.0" && \
+		append-cppflags "-Diniparser_getstr\(d,i\)=iniparser_getstring\(d,i,NULL\)"
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local myconf=()
+
+	# we can't alter S since build system writes to '../' and therefore
+	# we need to duplicate the whole structure
+	cd source3 || die
+
+	# Filter out -fPIE
+	[[ ${CHOST} == *-*bsd* ]] && myconf+=( --disable-pie )
+
+	#Allowing alpha/s390/sh to build
+	if use alpha || [[ ${ABI} == s390 ]] || use sh ; then
+		local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}
+		replace-flags -O? -O1
+	fi
+
+	# http://wiki.samba.org/index.php/CTDB_Setup
+	use cluster && myconf+=( --disable-pie )
+
+	# Upstream refuses to make this configurable
+	myconf+=( ac_cv_header_sys_capability_h=$(usex caps) )
+
+	# 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 \
+		$(multilib_native_use_enable debug developer) \
+		--enable-largefile \
+		--enable-socket-wrapper \
+		--enable-nss-wrapper \
+		$(multilib_native_use_enable swat) \
+		$(multilib_native_use_enable debug dmalloc) \
+		$(multilib_native_use_enable cups) \
+		--disable-iprint \
+		$(use_enable fam) \
+		--enable-shared-libs \
+		--disable-dnssd \
+		$(multilib_native_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) \
+		$(multilib_native_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) \
+		$(multilib_native_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
+}
+
+multilib_src_compile() {
+	cd source3 || die
+
+	# 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 multilib_is_native_abi; then
+		if [ -n "${BINPROGS}" ] ; then
+			einfo "make binprogs"
+			emake ${BINPROGS}
+		fi
+		if [ -n "${SBINPROGS}" ] ; then
+			einfo "make sbinprogs"
+			emake ${SBINPROGS}
+		fi
+	fi
+
+	if [ -n "${KRBPLUGIN}" ] ; then
+		einfo "make krbplugin"
+		emake ${KRBPLUGIN}${PLUGINEXT}
+	fi
+}
+
+multilib_src_install() {
+	cd source3 || die
+
+	# pkgconfig files installation needed, bug #464818
+	local pkgconfigdir=/usr/$(get_libdir)/pkgconfig
+
+	# install libs
+	if use addns ; then
+		einfo "install addns library"
+		emake installlibaddns DESTDIR="${D}"
+	fi
+	if use netapi ; then
+		einfo "install netapi library"
+		emake installlibnetapi DESTDIR="${D}"
+		insinto $pkgconfigdir
+		doins pkgconfig/netapi.pc
+	fi
+	if use smbclient ; then
+		einfo "install smbclient library"
+		emake installlibsmbclient DESTDIR="${D}"
+		insinto $pkgconfigdir
+		doins pkgconfig/smbclient.pc
+	fi
+	if use smbsharemodes ; then
+		einfo "install smbsharemodes library"
+		emake installlibsmbsharemodes DESTDIR="${D}"
+		insinto $pkgconfigdir
+		doins pkgconfig/smbsharemodes.pc
+	fi
+
+	# install modules
+	emake installmodules DESTDIR="${D}"
+
+	if use pam ; then
+		einfo "install pam modules"
+		emake installpammodules DESTDIR="${D}"
+
+		if use winbind ; then
+			newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
+			doman ../docs/manpages/pam_winbind.8
+			# bug #376853
+			insinto /etc/security
+			doins ../examples/pam_winbind/pam_winbind.conf || die
+		fi
+
+		newpamd "${CONFDIR}/samba.pam" samba
+		dodoc pam_smbpass/README
+	fi
+
+	# Nsswitch extensions. Make link for wins and winbind resolvers
+	if use winbind ; then
+		einfo "install libwbclient"
+		emake installlibwbclient DESTDIR="${D}"
+		dolib.so ../nsswitch/libnss_wins.so
+		dosym libnss_wins.so /usr/$(get_libdir)/libnss_wins.so.2
+		dolib.so ../nsswitch/libnss_winbind.so
+		dosym libnss_winbind.so /usr/$(get_libdir)/libnss_winbind.so.2
+		insinto $pkgconfigdir
+		doins pkgconfig/wbclient.pc
+		einfo "install libwbclient related manpages"
+		doman ../docs/manpages/idmap_rid.8
+		doman ../docs/manpages/idmap_hash.8
+		if use ldap ; then
+			doman ../docs/manpages/idmap_adex.8
+			doman ../docs/manpages/idmap_ldap.8
+		fi
+		if use ads ; then
+			doman ../docs/manpages/idmap_ad.8
+		fi
+	fi
+
+	# install binaries
+	if multilib_is_native_abi; then
+		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
+	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
+}
+
+multilib_src_install_all() {
+	# 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 || die
+			doins -r auth autofs dce-dfs LDAP logon misc pdb \
+				perfcounter printer-accounting printing scripts tridge \
+				validchars VFS
+		fi
+	fi
+
+	# Remove empty installation directories
+	rmdir --ignore-fail-on-non-empty \
+		"${ED}/usr/$(get_libdir)/samba" \
+		"${ED}/usr"/{sbin,bin} \
+		"${ED}/usr/share"/{man,locale,} \
+		"${ED}/var"/{run,lib/samba/private,lib/samba,lib,cache/samba,cache,} \
+	#	|| die "tried to remove non-empty dirs, this seems like a bug in the ebuild"
+
+	systemd_dotmpfilesd "${FILESDIR}"/samba.conf
+	systemd_dounit "${FILESDIR}"/nmbd.service
+	systemd_dounit "${FILESDIR}"/smbd.{service,socket}
+	systemd_newunit "${FILESDIR}"/smbd_at.service 'smbd@.service'
+	systemd_dounit "${FILESDIR}"/winbindd.service
+}
+
+pkg_postinst() {
+	elog "Samba 3.6 has adopted a number of improved security defaults that"
+	elog "will impact on existing users of Samba."
+	elog "			client ntlmv2 auth = yes"
+	elog "			client use spnego principal = no"
+	elog "			send spnego principal = no"
+	elog ""
+	elog "SMB2 protocol support in 3.6.0 is fully functional and can be "
+	elog "enabled by setting 'max protocol = smb2'. SMB2 is a new "
+	elog "implementation of the SMB protocol used by Windows Vista and higher"
+	elog ""
+	elog "For further information make sure to read the release notes at"
+	elog "http://samba.org/samba/history/${P}.html and "
+	elog "http://samba.org/samba/history/${PN}-3.6.0.html"
+}
diff --git a/net-fs/samba/samba-4.0.24.ebuild b/net-fs/samba/samba-4.0.24.ebuild
deleted file mode 100644
index 089e8169af4a..000000000000
--- a/net-fs/samba/samba-4.0.24.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.0.24.ebuild,v 1.1 2015/01/15 21:01:48 polynomial-c Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='threads(+)'
-
-inherit python-single-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)
-# sys-libs/pam is an automagic dependency (see bug #489770)
-CDEPEND="${PYTHON_DEPS}
-	>=app-crypt/heimdal-1.5[-ssl]
-	dev-libs/iniparser
-	dev-libs/popt
-	sys-libs/readline
-	virtual/libiconv
-	dev-python/subunit[${PYTHON_USEDEP}]
-	sys-apps/attr
-	sys-libs/libcap
-	>=sys-libs/ldb-1.1.16
-	>=sys-libs/tdb-1.2.11[python,${PYTHON_USEDEP}]
-	>=sys-libs/talloc-2.0.8[python,${PYTHON_USEDEP}]
-	>=sys-libs/tevent-0.9.18
-	sys-libs/zlib
-	virtual/pam
-	acl? ( virtual/acl )
-	addns? ( net-dns/bind-tools[gssapi] )
-	aio? ( dev-libs/libaio )
-	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 )"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	client? ( net-fs/cifs-utils[ads?] )
-	selinux? ( sec-policy/selinux-samba )
-"
-
-REQUIRED_USE="ads? ( acl ldap )
-	${PYTHON_REQUIRED_USE}"
-
-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}/named.conf.dlz.patch"
-	"${FILESDIR}/${PN}-4.0.19-automagic_aio_fix.patch"
-)
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	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=/var/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.0.23.ebuild b/net-fs/samba/samba-4.0.25.ebuild
index 9fba5f51feab..9464e5663642 100644
--- a/net-fs/samba/samba-4.0.23.ebuild
+++ b/net-fs/samba/samba-4.0.25.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.0.23.ebuild,v 1.2 2015/01/03 19:54:54 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.0.25.ebuild,v 1.1 2015/02/23 22:43:37 polynomial-c Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -35,7 +35,7 @@ CDEPEND="${PYTHON_DEPS}
 	>=app-crypt/heimdal-1.5[-ssl]
 	dev-libs/iniparser
 	dev-libs/popt
-	sys-libs/readline
+	sys-libs/readline:=
 	virtual/libiconv
 	dev-python/subunit[${PYTHON_USEDEP}]
 	sys-apps/attr
diff --git a/net-fs/samba/samba-4.1.15.ebuild b/net-fs/samba/samba-4.1.15.ebuild
deleted file mode 100644
index 47d5fa7c5325..000000000000
--- a/net-fs/samba/samba-4.1.15.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.1.15.ebuild,v 1.1 2015/01/13 08:49:48 polynomial-c Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='threads(+)'
-
-inherit python-single-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 systemd test winbind"
-
-# sys-apps/attr is an automagic dependency (see bug #489748)
-# sys-libs/pam is an automagic dependency (see bug #489770)
-CDEPEND="${PYTHON_DEPS}
-	>=app-crypt/heimdal-1.5[-ssl]
-	dev-libs/iniparser
-	dev-libs/popt
-	sys-libs/readline
-	virtual/libiconv
-	dev-python/subunit[${PYTHON_USEDEP}]
-	sys-apps/attr
-	sys-libs/libcap
-	>=sys-libs/ntdb-1.0[python,${PYTHON_USEDEP}]
-	>=sys-libs/ldb-1.1.17
-	>=sys-libs/tdb-1.2.12[python,${PYTHON_USEDEP}]
-	>=sys-libs/talloc-2.0.8[python,${PYTHON_USEDEP}]
-	>=sys-libs/tevent-0.9.18
-	sys-libs/zlib
-	virtual/pam
-	acl? ( virtual/acl )
-	addns? ( net-dns/bind-tools[gssapi] )
-	aio? ( dev-libs/libaio )
-	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 )
-	systemd? ( sys-apps/systemd:0= )"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	client? ( net-fs/cifs-utils[ads?] )
-	selinux? ( sec-policy/selinux-samba )
-"
-
-REQUIRED_USE="ads? ( acl ldap )
-	${PYTHON_REQUIRED_USE}"
-
-RESTRICT="mirror"
-
-S="${WORKDIR}/${MY_P}"
-
-CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.1.14-named.conf.dlz.patch"
-	"${FILESDIR}/${PN}-4.0.19-automagic_aio_fix.patch"
-	# support libsystemd (instead of libsystemd-daemon), bug #526362
-	"${FILESDIR}/${PN}-4.1.14-libsystemd.patch"
-)
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	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=/var/run/${PN} \
-		--disable-rpath \
-		--disable-rpath-install \
-		--nopyc \
-		--nopyo \
-		--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 systemd) \
-		$(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() {
-	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.16.ebuild b/net-fs/samba/samba-4.1.17.ebuild
index 6461faa76fbb..287b33f8501c 100644
--- a/net-fs/samba/samba-4.1.16.ebuild
+++ b/net-fs/samba/samba-4.1.17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.1.16.ebuild,v 1.1 2015/02/19 09:43:23 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.1.17.ebuild,v 1.1 2015/02/23 22:43:37 polynomial-c Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )