moving cifs-utils to an RDEP per bug #489472

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

8 files changed, 59 insertions, 50 deletions

diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog
index 8400c9cc327a..02f678d0e4dd 100644
--- a/net-fs/samba/ChangeLog
+++ b/net-fs/samba/ChangeLog
@@ -1,6 +1,11 @@
 # 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.622 2013/11/12 09:28:07 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.623 2013/11/15 23:25:46 zerochaos Exp $
+
+  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,
+  samba-4.1.0-r1.ebuild, samba-4.1.1.ebuild:
+  moving cifs-utils to an RDEP per bug #489472
 
 *samba-4.1.1 (12 Nov 2013)
 *samba-4.0.11 (12 Nov 2013)
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 83f71a39f1b2..199099c9a849 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX 3.5/lmhosts 126 SHA256 f959c6e6b4179de24b2268c13b7cd8a8e400e43d0852f91dfb8dc8e48f56f80e SHA512 d9bc9c67b3f4bb128fee620550f46576a5554233bce2b2a0300645f6d60a40c25f88caf91057472b0cd1908c31d5494ce1c21a112535f91460cc97a75e0cfa69 WHIRLPOOL c691eb8df9272d5404a073e0507b16d7b8b6750af79090340733ebfb3428b1a106f6099cfb3c75e768da1e6adc2e6b89f4e7b9640144a5519a9cf8e6add321e1
 AUX 3.5/nsswitch.conf-winbind 406 SHA256 c6d461204201143f874f460df35f7fbb2345f93ed0d6c20b280c15864011e893 SHA512 15e42519630c8dc03fe5eed233c707be57290c79aa45085cde5dcaca2ea56ad9939bc981815f9fe832e4a8965cedcf61f451c9e89fe213b167af4a773b58a04d WHIRLPOOL afe807c64abcd1383872751d2cbed1e43a8f7c717a0b047022c890909484d9ab5559c0a260dcfa04313424bfcc0b64411a318f6f0a43975e846acffef2a49c63
@@ -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 12760 SHA256 993dfde9a5e18c039e9f7683fb7b5e84836b99360450f76e724a663a09a06df3 SHA512 98b1d91f8aa5798ae2ae04bf267202033125781b349cc33a9192a7e1b9bb76e1b4dd058203aff5964e350218ba36cde1f77ca9965db482c7d929541a672df36e WHIRLPOOL 31bbbdc30ee06337b89c095f72724ff383a4c4a7c0df52bdfdd18ebebc52a6a30c25b76af91670ad441790fa61328c441c694dd5cbcbcc85a0c52339213bdaee
-EBUILD samba-3.6.20.ebuild 12772 SHA256 d4fb23539c83e9aa3239c4d90db635ff68380a86347c6a2b8310a217fb82d00f SHA512 8d9c5365b9f182347b2b2e38006c407d5db47da7c367074a2813243f924a5718ebd67f4a966bd39ec5edf9e4948ee412d23cc957ca03d787594ba819bceaadbd WHIRLPOOL 68f5e8cbf8dc23d717aed1379842781fc93161addd7052b6de0ea7535c35c72e5a8f62d49b3248bc1061e9b01ddb0f0fd691c76d38335bd62b87248d8636b576
-EBUILD samba-4.0.10-r1.ebuild 4759 SHA256 4d3533f6c5aeabe37fecf448c3a2d655643c55165bded6f21b90dd8a18eaa482 SHA512 2e99dc9abd6c89d9bf2dc2ea226a2c5e9b2e79e97daf36318283be1afff26425d1273500ec914b8f5e14643bd829ba0d586c940b262955f71a50d2eec4e4c7e6 WHIRLPOOL 76693413632d84ef1800f97176a68080dfc7faf1c41fea61ee62bcc586c3a7a046b6b4f6ea88520bd64ec62ada58ed5999572abba6d51d0cb8ae98bde17fd84b
-EBUILD samba-4.0.11.ebuild 4863 SHA256 2fac9e2580e10823cab939dfae8bf31de69fb858b0dfc2ef4258743263dafc87 SHA512 e0606db448da8c5ec13c5322c2b27da19f2d5ddca4e92f2c61d4d3e664394d3799d2a1fd24d2291b368c190cac9fff517be4677ab7e9316777b0c859fa16b2a1 WHIRLPOOL afe54da4073000dfdfb1cff41578e14b02cec74b63965114234c509dfd4b0adc26f7106de78e650e6ba83f5f46bb73da261677f468a4534e028a0bcc91c764c9
-EBUILD samba-4.1.0-r1.ebuild 4596 SHA256 78b5a8d479053de2f9b5f90beb495b64f60c0c7a7feb205d49dd6c7fecf883af SHA512 a346faeb38f0522afe9b16766f6ad517cd34cd8b2271d31179fc401b8e4a524a9fbab12967b7c0f95ac2088c90775e39eb4d088580777575b841dbb456f9d4cc WHIRLPOOL bbd8e438703ebef6496ad21883fe9a48c2020daeaf7dda081180f4f09db7b285d256636e8a85e68b0eb6a0f2d2c01098cdc79f71a763352e0f00636fe21eea69
-EBUILD samba-4.1.1.ebuild 4700 SHA256 69e2f4c0544100c83085935ae719fab51b847301721bb4fb36762bd17d7bfb79 SHA512 ca8836e12d0715017535c88b477be7ac11c3c0a9740aeba54e0ea2949ee3ae54faf23822bfa58dd2ab35bd91300fb5eabb2afa17c9d8ee0d4e863c63f25778c2 WHIRLPOOL 1ce1e74a730a2aaf3b12435f0a39fd487b84e96b58418362a671f4f7cd766799bb50f96b61fe34fe1ee74c05df7d13f5eab1ee95dd50bcf4e06f4eb0e0345c4d
-MISC ChangeLog 102861 SHA256 2a151fe5434f7f0c365e57f1dc1ac17bf3641fbcae4c7fa08202a9ccf7a2aa70 SHA512 5bb814c38938e3058191a5fcdbc1d505dc831653cb868caf58718708519f5590a8626a76c93e22edb10b6f816ebafc42f3f05fe9399628a1f88e516e1f50bc10 WHIRLPOOL 6f5b015a79a7bc6a91f29363a6ccb92ec38fe739cf6a0a588cd98d3b3619301274b7996e37cbeed345c456b49bea603cb075dc0f9d233ed37e7af1aa8b5f2243
+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-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 metadata.xml 1514 SHA256 c10deb71703017ec67f4e5bac297d9b4581fec3d8b5549b6aea2a43bda642bc0 SHA512 9e67e8f7e0c972046e32bf4539142559c24183d6c3469e5af2f901728a3c02a9fbfd50e948a9fd414107fd0cb2a8de709ffe3fc5bf3372c77a4a3db6dc622ecc WHIRLPOOL ec92ea6a1b03e70c791670e97e7d9e07e6bdb82c24ed08c186e786afcd009ab63fbee7d481a4cdc394632ad312e58a2048dae3ff333f6f7a1ad19add55e2c8f8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSgfSpAAoJEPiazRVxLXTFK70QALZRRbOw61cJZ7uHLdFwN8Qf
-PjFYfQbDZT3nYugGRw5eXYzHuwKDMDjqTL2GzE8IDjUv2HKsA9JZSK4cqd555aa4
-x6BlgyQM/BU4BWzgqMr1Az4QOeH7amJO63fAWFr3c1Kt9mXTj3RWllfkUPgzG+7T
-xuliWbwf+WOtZuUE2JTupeJh+0DL3fxU8iSEew3fUNziSHsy746tXEeam/ZUEJ6b
-jNEGPfbqfmDdJynQ5XXvpF1YdqDBHF0N26OaJi58sPezWd+qjOaIPCtI14Gl5LHP
-iABNxYyLi2i+s+BYoF5FA3Wl2GXmeUiQ9pqIVqB+Mk+C4fanlAPjbnf60lINekSO
-ft0tX0pzbnQKI5Zt30cU0lVszQmv1zST+bV7sS3VeisytsLBMkrAvvlx+JdMNpsb
-YHagCZ4UTtnio+t59z/+NuSpScEBSyW5vnrAqgrp8wr4/ssJrLD76FSCnfoHcO+Y
-jCbP+HqCnz6D5uudTCn/Tc+VDbt9s3Vbdjy0rZHHzKevvselPCO2J/KbxpDTf6ab
-Knv3xTG7E5H7Vd24yWXbd4htxXg4wJMexZFPGUi62Us8L3Fi8jdbQW6P/Qyp0moT
-Js0+vOZYxmmSdb3eQNrzEOSAiDr9Y9uzZj1Vx2PT3Qrmx97rjXITDWHT09gLY+P1
-iWj7fWRgWh0k+fhddcw+
-=Ud28
+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
 -----END PGP SIGNATURE-----
diff --git a/net-fs/samba/samba-3.6.19.ebuild b/net-fs/samba/samba-3.6.19.ebuild
index dbcda4e539ce..89f98633e5e7 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.12 2013/11/02 12:44:18 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.6.19.ebuild,v 1.13 2013/11/15 23:25:46 zerochaos Exp $
 
 EAPI=4
 
@@ -25,13 +25,11 @@ DEPEND="dev-libs/popt
 	>=sys-libs/tevent-0.9.18
 	virtual/libiconv
 	ads? ( virtual/krb5 sys-fs/e2fsprogs
-		client? ( sys-apps/keyutils
-			kernel_linux? ( net-fs/cifs-utils[ads] ) ) )
+		client? ( sys-apps/keyutils ) )
 	avahi? ( net-dns/avahi[dbus] )
 	caps? ( sys-libs/libcap )
 	client? ( !net-fs/mount-cifs
-		dev-libs/iniparser
-		kernel_linux? ( net-fs/cifs-utils ) )
+		dev-libs/iniparser )
 	cluster? ( >=dev-db/ctdb-1.13 )
 	cups? ( net-print/cups )
 	debug? ( dev-libs/dmalloc )
@@ -46,7 +44,9 @@ DEPEND="dev-libs/popt
 	selinux? ( sec-policy/selinux-samba )
 	syslog? ( virtual/logger )"
 
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	kernel_linux? ( ads? ( net-fs/cifs-utils[ads] )
+			client? ( net-fs/cifs-utils ) )"
 
 # Disable tests since we don't want to build that much here
 RESTRICT="test"
diff --git a/net-fs/samba/samba-3.6.20.ebuild b/net-fs/samba/samba-3.6.20.ebuild
index d42771260598..e4f02eef3693 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.1 2013/11/12 09:28:07 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.6.20.ebuild,v 1.2 2013/11/15 23:25:46 zerochaos Exp $
 
 EAPI=4
 
@@ -25,13 +25,11 @@ DEPEND="dev-libs/popt
 	>=sys-libs/tevent-0.9.18
 	virtual/libiconv
 	ads? ( virtual/krb5 sys-fs/e2fsprogs
-		client? ( sys-apps/keyutils
-			kernel_linux? ( net-fs/cifs-utils[ads] ) ) )
+		client? ( sys-apps/keyutils ) )
 	avahi? ( net-dns/avahi[dbus] )
 	caps? ( sys-libs/libcap )
 	client? ( !net-fs/mount-cifs
-		dev-libs/iniparser
-		kernel_linux? ( net-fs/cifs-utils ) )
+		dev-libs/iniparser )
 	cluster? ( >=dev-db/ctdb-1.13 )
 	cups? ( net-print/cups )
 	debug? ( dev-libs/dmalloc )
@@ -46,7 +44,9 @@ DEPEND="dev-libs/popt
 	selinux? ( sec-policy/selinux-samba )
 	syslog? ( virtual/logger )"
 
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	kernel_linux? ( ads? ( net-fs/cifs-utils[ads] )
+			client? ( net-fs/cifs-utils ) )"
 
 # Disable tests since we don't want to build that much here
 RESTRICT="test"
diff --git a/net-fs/samba/samba-4.0.10-r1.ebuild b/net-fs/samba/samba-4.0.10-r1.ebuild
index adc3c3c2262a..fd9b0ab435e8 100644
--- a/net-fs/samba/samba-4.0.10-r1.ebuild
+++ b/net-fs/samba/samba-4.0.10-r1.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.10-r1.ebuild,v 1.2 2013/10/29 14:06:56 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.0.10-r1.ebuild,v 1.3 2013/11/15 23:25:46 zerochaos Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_{6,7} )
@@ -32,7 +32,7 @@ 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)
-RDEPEND="${PYTHON_DEPS}
+CDEPEND="${PYTHON_DEPS}
 	>=app-crypt/heimdal-1.5[-ssl]
 	dev-libs/iniparser
 	dev-libs/libaio
@@ -51,15 +51,16 @@ RDEPEND="${PYTHON_DEPS}
 	virtual/pam
 	acl? ( virtual/acl )
 	addns? ( net-dns/bind-tools[gssapi] )
-	client? ( net-fs/cifs-utils[ads?] )
 	cluster? ( >=dev-db/ctdb-1.0.114_p1 )
 	fam? ( virtual/fam )
 	gnutls? ( dev-libs/libgcrypt
 		>=net-libs/gnutls-1.4.0 )
 	ldap? ( net-nds/openldap )
 	selinux? ( sec-policy/selinux-samba )"
-DEPEND="${RDEPEND}
+DEPEND="${CDEPEND}
 	virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+	client? ( net-fs/cifs-utils[ads?] )"
 
 REQUIRED_USE="ads? ( acl ldap )"
 
diff --git a/net-fs/samba/samba-4.0.11.ebuild b/net-fs/samba/samba-4.0.11.ebuild
index c8db2b6ebb84..63aa7af7a989 100644
--- a/net-fs/samba/samba-4.0.11.ebuild
+++ b/net-fs/samba/samba-4.0.11.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.11.ebuild,v 1.1 2013/11/12 09:28:07 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.0.11.ebuild,v 1.2 2013/11/15 23:25:46 zerochaos Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_{6,7} )
@@ -31,7 +31,7 @@ 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)
-RDEPEND="${PYTHON_DEPS}
+CDEPEND="${PYTHON_DEPS}
 	>=app-crypt/heimdal-1.5[-ssl]
 	dev-libs/iniparser
 	dev-libs/libaio
@@ -49,7 +49,6 @@ RDEPEND="${PYTHON_DEPS}
 	virtual/pam
 	acl? ( virtual/acl )
 	addns? ( net-dns/bind-tools[gssapi] )
-	client? ( net-fs/cifs-utils[ads?] )
 	cluster? ( >=dev-db/ctdb-1.0.114_p1 )
 	dmapi? ( sys-apps/dmapi )
 	fam? ( virtual/fam )
@@ -57,8 +56,10 @@ RDEPEND="${PYTHON_DEPS}
 		>=net-libs/gnutls-1.4.0 )
 	ldap? ( net-nds/openldap )
 	selinux? ( sec-policy/selinux-samba )"
-DEPEND="${RDEPEND}
+DEPEND="${CDEPEND}
 	virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+	client? ( net-fs/cifs-utils[ads?] )"
 
 REQUIRED_USE="ads? ( acl ldap )"
 
diff --git a/net-fs/samba/samba-4.1.0-r1.ebuild b/net-fs/samba/samba-4.1.0-r1.ebuild
index 4f8b150361d7..0f1d5f5e58ce 100644
--- a/net-fs/samba/samba-4.1.0-r1.ebuild
+++ b/net-fs/samba/samba-4.1.0-r1.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.1.0-r1.ebuild,v 1.2 2013/10/29 14:06:56 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.1.0-r1.ebuild,v 1.3 2013/11/15 23:25:46 zerochaos Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_{6,7} )
@@ -26,7 +26,7 @@ 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)
-RDEPEND="${PYTHON_DEPS}
+CDEPEND="${PYTHON_DEPS}
 	>=app-crypt/heimdal-1.5[-ssl]
 	dev-libs/iniparser
 	dev-libs/libaio
@@ -45,15 +45,16 @@ RDEPEND="${PYTHON_DEPS}
 	virtual/pam
 	acl? ( virtual/acl )
 	addns? ( net-dns/bind-tools[gssapi] )
-	client? ( net-fs/cifs-utils[ads?] )
 	cluster? ( >=dev-db/ctdb-1.0.114_p1 )
 	fam? ( virtual/fam )
 	gnutls? ( dev-libs/libgcrypt
 		>=net-libs/gnutls-1.4.0 )
 	ldap? ( net-nds/openldap )
 	selinux? ( sec-policy/selinux-samba )"
-DEPEND="${RDEPEND}
+DEPEND="${CDEPEND}
 	virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+	client? ( net-fs/cifs-utils[ads?] )"
 
 REQUIRED_USE="ads? ( acl ldap )"
 
diff --git a/net-fs/samba/samba-4.1.1.ebuild b/net-fs/samba/samba-4.1.1.ebuild
index 2ab4549c3fc8..ce633d296050 100644
--- a/net-fs/samba/samba-4.1.1.ebuild
+++ b/net-fs/samba/samba-4.1.1.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.1.1.ebuild,v 1.1 2013/11/12 09:28:07 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.1.1.ebuild,v 1.2 2013/11/15 23:25:46 zerochaos Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_{6,7} )
@@ -25,7 +25,7 @@ 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)
-RDEPEND="${PYTHON_DEPS}
+CDEPEND="${PYTHON_DEPS}
 	>=app-crypt/heimdal-1.5[-ssl]
 	dev-libs/iniparser
 	dev-libs/libaio
@@ -43,7 +43,6 @@ RDEPEND="${PYTHON_DEPS}
 	virtual/pam
 	acl? ( virtual/acl )
 	addns? ( net-dns/bind-tools[gssapi] )
-	client? ( net-fs/cifs-utils[ads?] )
 	cluster? ( >=dev-db/ctdb-1.0.114_p1 )
 	dmapi? ( sys-apps/dmapi )
 	fam? ( virtual/fam )
@@ -51,8 +50,10 @@ RDEPEND="${PYTHON_DEPS}
 		>=net-libs/gnutls-1.4.0 )
 	ldap? ( net-nds/openldap )
 	selinux? ( sec-policy/selinux-samba )"
-DEPEND="${RDEPEND}
+DEPEND="${CDEPEND}
 	virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+	client? ( net-fs/cifs-utils[ads?] )"
 
 REQUIRED_USE="ads? ( acl ldap )"