acl use flag is default from profiles/releases/make.defaults, on cifs-utils this requires ads use flag which needs samba-3.6*[winbind} or >=samba-4; don't ask me why it doesn't need winbind on samba 4, closing bug 490122

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xDD11F94A

4 files changed, 27 insertions, 21 deletions

diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog
index 02f678d0e4dd..55b7d9e9d80d 100644
--- a/net-fs/samba/ChangeLog
+++ b/net-fs/samba/ChangeLog
@@ -1,6 +1,12 @@
 # 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.623 2013/11/15 23:25:46 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.624 2013/11/15 23:56:41 zerochaos Exp $
+
+  15 Nov 2013; Rick Farina <zerochaos@gentoo.org> samba-3.6.19.ebuild,
+  samba-3.6.20.ebuild:
+  acl use flag is default from profiles/releases/make.defaults, on cifs-utils
+  this requires ads use flag which needs samba-3.6*[winbind} or >=samba-4; don't
+  ask me why it doesn't need winbind on samba 4, closing bug 490122
 
   15 Nov 2013; Rick Farina <zerochaos@gentoo.org> samba-3.6.19.ebuild,
   samba-3.6.20.ebuild, samba-4.0.10-r1.ebuild, samba-4.0.11.ebuild,
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 199099c9a849..6ab7b76dbf78 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -48,28 +48,28 @@ DIST samba-4.1.1.tar.gz 23152191 SHA256 c70c343f5bcd2bfe3f4b55860e680a6ed70ce301
 DIST smb_traffic_analyzer_v2.diff.bz2 12226 SHA256 1bae7eafbe8ac2382313d5ab9d43d73ba64b63a714f0f588516952d476fb868d SHA512 aa0e457a0dd282e61e6dfcd5705c29b319832dca9711b1b5baf8373e2f079991399c3537c050219ccb861a93f86353ebff677a5c625d2e3f1f3a13ee5c4087d0 WHIRLPOOL 85ee72a360f67ebe71be5cd400ecd635280a0d7c64ebb8b94656a5ef1a94f74a987de86408af00ce1b81cc8363b1b3cf14726860d29b72ee610d4bab73d6b139
 EBUILD samba-3.5.21.ebuild 12311 SHA256 2a849451f886614315680b28b944840d1c670a2b878329773de63a72797a6fa1 SHA512 5006f1afdc2df93f317d15e1e9781bee20eb0e17e4a15892cb5ebe8bb2ab0a7a56bbbf2ed67099620391eda14b53a8fdb78a5ee9634a489915fcf84b031704b7 WHIRLPOOL a295b28990480ed3e13cf76d4f04270739b2669837d5ea93691888c488ee10dad22cd4bcc2037b09e66be41eda4d3d2e064e28701acb1f2dc7acf80935283123
 EBUILD samba-3.5.22.ebuild 12309 SHA256 dc195567858dc0c11b2b86fc42427e1066c5efeef29bfe047bdbac413a62007d SHA512 82125fe1d5ba33f57ca06e513090eb0f2cedcda3242773b8734b4b0a18c68ab12f9149651908ddffbe3b2687b9876491a6cbbee7dc4f1e0584a5eef218ff8a57 WHIRLPOOL 9e87a5fb631fd519c2fc89da8a1a591fc9a4eb58eee63052f09321a6f115dbd82e8dd383843b6e6feffe68edaacb4de5c6ba6e9e66a098fa0cddc480988776c8
-EBUILD samba-3.6.19.ebuild 12763 SHA256 f02d02e51c65bb6c52620156f193bc59fd2e107878ddb1aafde1640f99e829a8 SHA512 163d569e6df315b84dd13ee46e8cade8d4804c0ec8aa58bd6f6453197a56238f1ecb91cd48cdd4e22adac6c2a1adc3078d7714b718e285c0c720889abd8e782d WHIRLPOOL 4c5cb9f7ad8fe2af5d4dd60cb3a78c9137e48aa868dd0ab9a42657e508f28a87396daed2881e07d8782beec808ee174bba722ee5ab0af36d844cbb2820d62f0d
-EBUILD samba-3.6.20.ebuild 12771 SHA256 9811d12ce5e51083bbd8f9cc210896a711b94fd85ada0e7d1fa1ff5689a62127 SHA512 96cecb4dc6ecbebf66697f7528ca7d20afc8ccbca5d69d74957c1df1e2a07f5556dd8b38fe626734f406960ecc46a805f88a5a117d82d5a131070f61ea7ce3a3 WHIRLPOOL e13f15b163b588e7894f588b4b0a58d129f5f06e3d5a9c6177cda0d8de298443eccd36b22cd17703f991c075d268feeccb930e0999968e0ca3c1a58d37d9dce1
+EBUILD samba-3.6.19.ebuild 12764 SHA256 4c48786cedfe51b1cf7e0033011029c89e6ad51143f497d9de5a11a99d4fdbef SHA512 bc3ad37d66e90a3f7d2c408f6add5333d79e2bd6620bfd1986c0edae5acc3ae13e96a094bb81e14dd23c69aab8b91fbecf36293058fac48f742d1b746d9ec046 WHIRLPOOL 808174cfb900b5e4e5ccea43bfce6e38349f7c324567e55edd68e8b2ac45ce855a6ef61e7dc06671b09160afb1e9d17825acc59656f8bebf529568a77b5921b9
+EBUILD samba-3.6.20.ebuild 12772 SHA256 548c4a1bbfaf6a3312418b14ba34d9010a94937f48be0a44c1df429d27ab60b0 SHA512 3dabd6e69983d83277905f182b228bfbe9a4ab0c0f8f48f29a21a85e8fe14afb38ae7066f24442109025f25572681ec17ddb867aaa63b0df6be0bd1c64af752f WHIRLPOOL e2f99aef38cb5860c072a02ac072409c04c290dd23b848c06e474c98a2b9ea25d033e7f84cb9ab5b2499255ae8a4048dd422276756c9b2a5ff470cd18b95554c
 EBUILD samba-4.0.10-r1.ebuild 4777 SHA256 c57122a9847c4afdeca5dc95a5601cca7749dd4fb1afd682948e972ec99e1cbc SHA512 8fcc618c55ebb9ced831f830ab13a50973bede2deb4f72decb68fcfc2f0d5a46a0f885ae7b03f74a1b023659411cb4466e498b5ed4ebc52b7cfc88b75075a2f3 WHIRLPOOL ae7da55228df29e7990378f08b407c8c3424a39fb892bd5720f6653e3eadcb7b9307997d6d7d9aeb379d8e7c85078d1155e24e91b1d1bc26dcef5479971f7e27
 EBUILD samba-4.0.11.ebuild 4881 SHA256 a6eaaa610a90b084d0469f432a9150c3861d51d389463c3ac14f5725ee9722d5 SHA512 ca47596db887740d0ba48290b1c036b3221ad0c78184e7d258a87fa63dd742c6246b71e1d5f5cb3cbe9fc239a1f16c559d9bd6f06e98a9611a5dac40d309eea0 WHIRLPOOL 253b72a1033c5752020717018b59470766e99e0c0f63a755bd50aa269bba53e1a8b249e31035979be150932369ab87ce041a604f2c12c085ec467fb269308314
 EBUILD samba-4.1.0-r1.ebuild 4614 SHA256 2b84b3dbce1ab7d53b8338de593f048d0cc9514ff2b175bfdb3334559fc23763 SHA512 a9fb8a91ad397758ecb17732d7a41b63b74687c59dfb77db05c06126f3bdaa87acf2a494aef3bc9f8bba25661e6ed93fd08b42ae6a97f3e8703ce7ed294fd843 WHIRLPOOL eccc3fe9d9fc70269a2a10b3d90bd62655f129c301307940b2329e6071eef69971de605ed9f6ff388eda6f473ee930e2d86669aa8242c19c591cbe305f4be1e2
 EBUILD samba-4.1.1.ebuild 4718 SHA256 d1b6512480b0276b88538cd9c2ed655e5bb0c2ca22d11e10b6a36d33e1279c9a SHA512 34aeb1ca7f251f479db62c5e43c0e3bf2339d7bb1b4c8dcdeb525e9f73b3e28ddc615f349ed6eb2f2cca6c0ebce12ac526f1558852b80ba0ce6b2c44210450a5 WHIRLPOOL c4de291adc078fe498aeed67dc8686bcb586cb98ba38dec78a8239c93a756bb601de16a0b21e0b1939a9bed507fd568e0b4efc68e60efac72f2a48e2d000b3a9
-MISC ChangeLog 103090 SHA256 e6c10ccadefbd522336f7e41c5204ad336a0e43c0c941710bdbef1ba075502da SHA512 7a34987f422e3e170c407ddd8e25f902dc74ee0d18c767d332baecedb28b262b5c2ca0137031532aa247490b48113a3b2fff51702a395f187dd4cfbaa116ac4b WHIRLPOOL 8e1e0530075958b88be71b7113e6a97c43ad722e942ec2f9a3bf381ca3d21b69920fe06acdd581cad7b47d67268be5f9785164a9d70576df4f45d81d9e87fba5
+MISC ChangeLog 103412 SHA256 9945e487dd06ce41384a1d9132b48206c73c6066a140a757ecd28b74dea42e64 SHA512 180fc8f09dabdd6d07f62c747a32c07c41cc76bca3bf5d5b1b4fde7472ac7e9c72e88c3e8714aeeea6c811df67f36b193064f498ea9613f9c4f32156ed2bb997 WHIRLPOOL 496a713602dd0c2cbd1ee4883a716710b9c276f243d20921b2681d780213a7601adcd30c662a002cbec12bb59b064f87dd4c26e7d202e8b32f44c857407657b3
 MISC metadata.xml 1514 SHA256 c10deb71703017ec67f4e5bac297d9b4581fec3d8b5549b6aea2a43bda642bc0 SHA512 9e67e8f7e0c972046e32bf4539142559c24183d6c3469e5af2f901728a3c02a9fbfd50e948a9fd414107fd0cb2a8de709ffe3fc5bf3372c77a4a3db6dc622ecc WHIRLPOOL ec92ea6a1b03e70c791670e97e7d9e07e6bdb82c24ed08c186e786afcd009ab63fbee7d481a4cdc394632ad312e58a2048dae3ff333f6f7a1ad19add55e2c8f8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJShq2UAAoJEKXdFCfdEflK9FgP/0u9HJWU3IxRJFAMhfQzUpuA
-Rc24AUPyXqRTIIGlr+hD0FWdWK+spuAUKLL+BcLt+YMoYamdei6kXTLVqBNRGVA2
-amolASum1jlBDC6R+4EpFRXk/QP9sLK+n1wCsox44USjXcY5609ms9Kd8mrEATzy
-SPuk64ovYYYCCRGf4cWYucqz/0wFekX1rIj8OvBz9P7d/qEQq710bbDqI7TcMRlm
-yq/oJrSAozf2mylL4Hzyplq28V2Ddw/oO+Q/zrFGRkpH/vFsO9g1LssLqc1XBxWj
-rG3qTSyQlXWP9sdZ5XimutKqticK45Qi2zKo3u+8Em1Qp0zaXtMVe4V0/RPPYIWb
-0ZgfmJRbfxmXEDFMmW1Rpzcq3fZ47OyQGjMR1Mfigcek9O3sdczCjV6wMTbM6B1F
-NiUXtVlFZYVPmAiPZdoLeXTIAQfwqZLss4+XLxzPwUNRg2tOcC4yulZLBClZrRo5
-HLkQ36KfdNKXIRO+vTgSv+TYYuVkg99bzejtrPH4j8B96DGcoOKzStHniYhe6K9u
-PQ/SH2PyeFfVujap0lDffWPx+AnMBzd3WliXhH7gIis8wEKyTmp8EsBnBMP2JV00
-HGQ8Chn/ee1xvxB33EqVTzD22WjtmGyEvSFhoD9yDE+5hkMbIVjF9r4/f1whZXck
-A/Ah+Nv0uQ7EopKI/tXI
-=PTKq
+iQIcBAEBCgAGBQJShrTSAAoJEKXdFCfdEflK1gwQAKm6gypBkDpynu/Oz2/vdNTX
+R78ZamMZZjIrOOQ+edv6OlVo/9AOlDc7X1EScvYXsjZclBZxSZ4TDMO6TUT6Zisp
+apZ2HW8wMmDDh2FzRWaaXDvoDmAyDIHnBDKUy0WTL+jt5NkX8o1/zkxcT8QknD3T
+TM80XQTq/qTtzeJzClqE/nqwgd/eAH8si5wmjlEIJVJDwDKORQ+zq8Xc9lmcvmry
+kZXZ86Z8zEASV+CsFXeLD8z4O7S4qD/u+JKvaPFTM06+brEnfTZHQ/JxorKX5X+J
+z9JOy9TOCRundsMfBItzIGTJBoH3X8jP4cNO6HjcGLQkmXBBZt8jvZCfLOeX4mzN
+kjaGjA2XfvtEzH/GYoED/yFu6VV3f5TdWpcLckFz7h/P/eS/PhsxeHW/+/GCAa7m
+eMTwhtms8+9ZLITtQ6cYwKj8bduh6EjopECTsoIzDZP0fGsWVowOXJvDewsxJ+Wc
+wT6C0htwc4SNr0LwCyN+bjXHB8T/hlmm0lQL45TxxKJHA6Z9F/5ovbZvECLbhYTT
+V/TyMjuc748xRXCIqp5AlukEuXKRXd1lYts8+HAKdcjFuo5EWKu0orKciQMl+crN
+SGRz0zqghm+tpjzze2nEJCYtOWOljVUYyQY4SYits4XHwvRMhfj6GAZHU2Yz+6sk
+du6CIvRqtu7jOmBIAoJc
+=a2Zp
 -----END PGP SIGNATURE-----
diff --git a/net-fs/samba/samba-3.6.19.ebuild b/net-fs/samba/samba-3.6.19.ebuild
index 89f98633e5e7..1d16729b062b 100644
--- a/net-fs/samba/samba-3.6.19.ebuild
+++ b/net-fs/samba/samba-3.6.19.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.19.ebuild,v 1.13 2013/11/15 23:25:46 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.6.19.ebuild,v 1.14 2013/11/15 23:56:41 zerochaos Exp $
 
 EAPI=4
 
@@ -17,7 +17,7 @@ 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"
+	swat syslog +winbind"
 
 DEPEND="dev-libs/popt
 	>=sys-libs/talloc-2.0.5
diff --git a/net-fs/samba/samba-3.6.20.ebuild b/net-fs/samba/samba-3.6.20.ebuild
index e4f02eef3693..16aa88457f63 100644
--- a/net-fs/samba/samba-3.6.20.ebuild
+++ b/net-fs/samba/samba-3.6.20.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.20.ebuild,v 1.2 2013/11/15 23:25:46 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.6.20.ebuild,v 1.3 2013/11/15 23:56:41 zerochaos Exp $
 
 EAPI=4
 
@@ -17,7 +17,7 @@ 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"
+	swat syslog +winbind"
 
 DEPEND="dev-libs/popt
 	>=sys-libs/talloc-2.0.5