gentoo resync : 18.03.2018

6 files changed, 35 insertions, 20 deletions

diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index a26ca4d79de8..ae9deb31e55f 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -24,12 +24,12 @@ DIST samba-4.5.16.tar.gz 21024396 BLAKE2B e737559fb748044076608fa233700eb54c7e1c
 DIST samba-4.6.14.tar.gz 21161954 BLAKE2B e514c23f46679ba0415b91ada99e0263f123df6b1b76e5e1ead67ab248bb38cdc2e20107a71630b7c31305b3b2b72526b2b16758f048e7c1a0810af7f4fa09f7 SHA512 a235f5932d7ec2cad22c841ae5138c5bc5a8bce0fe2327146a7f34d9abb46656b323d66c490d0058bbf0831a5b5fa328722e0566155d430e3a180440be1c70d3
 DIST samba-4.6.7-disable-python-patches.tar.xz 8896 BLAKE2B 99496f91d015f10d111e2a8738c9e66b3c1f1958c0e0894d8e9d8f3ff141fbedaa25d93699b702ab69130fda770c80c3ed4280de0af1090dedbcfd5784b72222 SHA512 c45e548a49735e17b568bebf07dc7409de3de0f93256d1dcf345d2723a27d22a51d860ed921785354fda691f83be4eca3b9d618d5c332438ebf97518a01983eb
 DIST samba-4.7.6.tar.gz 16864824 BLAKE2B 0c519f83e95f9ef9ff13c6a4998d0c98e67765253e855386febe20f836873b10e94161d1539d24af835f464d56edd7f5595abd30b8d6b039cd8ba887563394b1 SHA512 8190b06f543cc3d4a9a98f93ad5e4e16e4e87ea462435723044a780942cea7efc77c66cd3e61941bf449a2ac0f4346ced378f032d5fb1776280a3c4bcb951b46
-DIST samba-4.8.0rc4.tar.gz 17662979 BLAKE2B bcafc3e26062ad31ae8cd946fabf1fbfa0d2f83c497ffa49e40e943314f98dca9920d3ccf6cdcd29e5cd4bcdd66b01791cc1dc233f655f88b1590477d45940b6 SHA512 dddcce6933bd7126e2bda0554f5702974d094dcff70487189f497824a2f6ca567bc3c8637dce6c60d444b040ce3fd144a6ec045cf5ddc2d13dfe3470e0de251b
+DIST samba-4.8.0.tar.gz 17659751 BLAKE2B 389d7b6039a00734b514eb017bb201f119b8b894b98af4387ac3186a082b2de295e78b58e96539b93433d3d850e9be19f6ef9a63f66fa9a330f3a88d25b28a03 SHA512 64ffbddb6cf9eee00e5d67a471387b81759c3b4bf67793083aa021e232c8321182182eb9c642b9c25fb1a488f135dec34f7e092d286f94836c488022f8a15c01
 DIST samba-disable-python-patches-4.2.12.tar.xz 6052 BLAKE2B 0ae755cbbd8921f4e2f5adf797cd3a77f81bb15ac2d1a65645bc9b53184c397a2bb35f83b88a0de680cc834a63b263e883e91206a7df99735f5ef8f091f54bb0 SHA512 c527d0a052d3211e5b12c17bc94db56cc5e5545189ed65a760c0656c94c22e27a4b159e6439eb0370873e1619873a741f3b3bd10d3876b38eb3914a87eace372
 EBUILD samba-4.2.14.ebuild 7066 BLAKE2B 7c88d976faf5e47b17678c2523a9cce59a93f4e401cc8a9d7e293051b9430fc6dada6c0eb0e06308e20ca6e10993c10d5a0c65ce55d26b4443d0b682efc4fd60 SHA512 b86f624ea3caaa517a8baf7e98edfdc470a294f2e0df3ccd5c3b979215386b762d166c81c187988ae151068149f722429e4b33e32092f842cb697aedacc8d6a5
-EBUILD samba-4.5.15.ebuild 8073 BLAKE2B cb5115f19a40b18a174ffa3a3fbdf52bd2e6a9365ec89dc3e34f6262297a8a67de9a4a8e1114c7d3bc073eebc1af4eeef2f3907af3789a514dff6afc5eaafa88 SHA512 b8982fe6d4e270dcaed305cd98201c157efef7d2b8123163416299fb8d76a401a1c7a61a0d28da36882ff111ea1421d6f57d0d7a5d6dff135ce7f18d800b6150
-EBUILD samba-4.5.16.ebuild 8080 BLAKE2B 530344f28a23ed85328bc26f883184dbcf1f25d030856f2a47e481802461e052a188b5ef95af61e3886f7ee392e38b79e648947946805b6da4025ce0f7000385 SHA512 1e841db69893a10d0d0c0e11274ddf838460679e62e053e3303dacd12107c113882f2ce8c5307461d8574355ed33bbd335700bc51cbbf19a8dba6dd86eb10163
-EBUILD samba-4.6.14.ebuild 8598 BLAKE2B 0a65164727671d2b354aaea1ee2e5a52e5f79578311ec6eff7084aaa5203c137bd2fffd74c8aebd7bd521e4445ad694d0f582014890f67fa0d76042bc92b2a4c SHA512 dfd1ada0fa469758a020df2d8f809392435161317a973f3238a525d0b7bb1bd8b616789895a9c29d403f230de20691ad8fef947cd1ae0aa158731ae8d07c21a6
-EBUILD samba-4.7.6.ebuild 8633 BLAKE2B 05750e87f1128adaf53bd8bd3df7dd84e7a78ca1e812f0bcbedf2bb43ec16ea0a7ded6d509660755c820d037d9dc1cfe50443a41af7034c7454419992846c385 SHA512 1cf04d30e69908d4c006c7653d3b955aad1413056f89f4e4795c438367fce09dfe6298c6d0e1f6676edc1160b0a5287dd5789474af46ac8132b863606eca9c49
-EBUILD samba-4.8.0_rc4.ebuild 8243 BLAKE2B 87914e1670184308cbd28f69cb8f84d8d775fc5458c4e70999fbaf601fad244a6250513409e4a6fc667b15285762efa754c70daa54409d9a0c5176304f5bbadd SHA512 85652064abfb209a54c20755c983abb69ab5fb7ebb3a27a4b27a818b680358bc18a6f8038c9a663a60555272875d8ed3eb40cfd7bcc6629b3e56e2f7cbcc0e70
+EBUILD samba-4.5.15.ebuild 8094 BLAKE2B eaca0d6a27865349f9c7c34ffa78dec632974021818dfbb5869f819aadf21b6585c27bddf7b85fb97a7ccb4dbd8e7ffaa329805e0b251a51914101767d80862f SHA512 3126a561de57cbf355e542aeb3de21e74be05ac839b851af8ded40a3625548671eb2ea874f315a592b06cdcb9c62d6db3116e9f96eaf1d39d1c8abc269fc8bcc
+EBUILD samba-4.5.16.ebuild 8094 BLAKE2B 2f9db841105c0699acd2e1700fa9bb38fb027761ccd0397a03819ac0c31c593a74b02ea68f2b93cbb3809af0611ba9227bed826a12320eb0392a05972fd0d403 SHA512 5c3538fcdfef8b014ba2d42765143b85a9dda23ba9e64f8ab0be14ab2e16653d976107e640317d50ed1a8e565456e2af417a68c38e5f35ea42a6592045334911
+EBUILD samba-4.6.14.ebuild 8619 BLAKE2B c331dbada58fb5ae792cfad8a97008b1453d13f101fc09ec40d85d5140b89c834576632da6c1b91c8ed0cdc79c18f1c75f2e046118b235a30926339dfd966afb SHA512 3abf8368b3f582879b9311f966594d20addae977c983516a7f9db401d45642cc213b8facd29612f8c9a2a033b860f9608cc3e6626451de88d37f461bb4f479fe
+EBUILD samba-4.7.6.ebuild 8654 BLAKE2B c2dfec298a58a11dddec7a8b0b41fc7b71e8109c750815d5fcd581cbf569254fd013e3a3b0884f37ff90f24ccbe39542b9545035ef871cad13c2b5f6206a7329 SHA512 3cca1a7037fc82cbbd9db490e86c8078a0a3587acda588619dd081e83bc132a400cd1a503a04f646c9eda37b18fe452f5dbf66094d388a5a0775a6a98cbd84f1
+EBUILD samba-4.8.0.ebuild 8298 BLAKE2B 11e30b67f4c8ef188fbbedb4d4c5ade57da52f66e81168c79c9f92bf57f933d29ba4b4fdeb360b5a5ce4b5c28dd2075517a13ba9f7980dc1818fbde11f5ef61e SHA512 63b19c10f2df496ac57b3575a94aea46795dae5416d44674b684eaaa1c4a6243a465b9e3d1d99fc1049eed0df64945ef3fe9025cf0df239b605e5370ab05e507
 MISC metadata.xml 1641 BLAKE2B d360b1d43e278d71dfcaacd749a730a55998a3f7e7676a113015eb93c1a30480f237705d93b8d22d0733a852bbe320397fcabe2d9c517330c1a24aa0e47ca1c6 SHA512 9e6bf4cb2b711f48a3f730f2e4e9cc8c460b46013fe78ad376855748bdff0d8e44beb05798de551c0c22cd2b40d74c2c30799393d05bd7c7a9161a74eb0e98be
diff --git a/net-fs/samba/samba-4.5.15.ebuild b/net-fs/samba/samba-4.5.15.ebuild
index 66526019e604..4d0ebd052baa 100644
--- a/net-fs/samba/samba-4.5.15.ebuild
+++ b/net-fs/samba/samba-4.5.15.ebuild
@@ -96,11 +96,14 @@ RDEPEND="${CDEPEND}
 	!dev-perl/Parse-Yapp
 "
 
-REQUIRED_USE="addc? ( gnutls !system-mitkrb5 )
+REQUIRED_USE="
+	addc? ( gnutls !system-mitkrb5 )
 	ads? ( acl gnutls ldap )
+	cluster? ( ads )
 	gpg? ( addc )
 	?? ( system-heimdal system-mitkrb5 )
-	${PYTHON_REQUIRED_USE}"
+	${PYTHON_REQUIRED_USE}
+"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/net-fs/samba/samba-4.5.16.ebuild b/net-fs/samba/samba-4.5.16.ebuild
index e4e3fd4b0bbe..5ca400685354 100644
--- a/net-fs/samba/samba-4.5.16.ebuild
+++ b/net-fs/samba/samba-4.5.16.ebuild
@@ -16,7 +16,7 @@ SRC_PATH="stable"
 SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz
 	https://dev.gentoo.org/~polynomial-c/samba-4.5.11-disable-python-patches.tar.xz"
 [[ ${PV} = *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ia64 ppc ppc64 sparc x86"
 
 DESCRIPTION="Samba Suite Version 4"
 HOMEPAGE="http://www.samba.org/"
@@ -96,8 +96,10 @@ RDEPEND="${CDEPEND}
 	!dev-perl/Parse-Yapp
 "
 
-REQUIRED_USE="addc? ( gnutls !system-mitkrb5 )
+REQUIRED_USE="
+	addc? ( gnutls !system-mitkrb5 )
 	ads? ( acl gnutls ldap )
+	cluster? ( ads )
 	gpg? ( addc )
 	?? ( system-heimdal system-mitkrb5 )
 	${PYTHON_REQUIRED_USE}"
diff --git a/net-fs/samba/samba-4.6.14.ebuild b/net-fs/samba/samba-4.6.14.ebuild
index ff66041de150..4768bc39a8ba 100644
--- a/net-fs/samba/samba-4.6.14.ebuild
+++ b/net-fs/samba/samba-4.6.14.ebuild
@@ -99,13 +99,16 @@ RDEPEND="${CDEPEND}
 	!dev-perl/Parse-Yapp
 "
 
-REQUIRED_USE="addc? ( python gnutls !system-mitkrb5 )
-	test? ( python )
+REQUIRED_USE="
+	addc? ( python gnutls !system-mitkrb5 )
 	addns? ( python )
 	ads? ( acl gnutls ldap )
+	cluster? ( ads )
 	gpg? ( addc )
+	test? ( python )
 	?? ( system-heimdal system-mitkrb5 )
-	${PYTHON_REQUIRED_USE}"
+	${PYTHON_REQUIRED_USE}
+"
 
 # the test suite is messed, it uses system-installed samba
 # bits instead of what was built, tests things disabled via use
diff --git a/net-fs/samba/samba-4.7.6.ebuild b/net-fs/samba/samba-4.7.6.ebuild
index ae147981edc7..da9d5260b043 100644
--- a/net-fs/samba/samba-4.7.6.ebuild
+++ b/net-fs/samba/samba-4.7.6.ebuild
@@ -103,13 +103,16 @@ RDEPEND="${CDEPEND}
 	!dev-perl/Parse-Yapp
 "
 
-REQUIRED_USE="addc? ( python gnutls )
-	test? ( python )
+REQUIRED_USE="
+	addc? ( python gnutls )
 	addns? ( python )
 	ads? ( acl gnutls ldap )
+	cluster? ( ads )
 	gpg? ( addc )
+	test? ( python )
 	?? ( system-heimdal system-mitkrb5 )
-	${PYTHON_REQUIRED_USE}"
+	${PYTHON_REQUIRED_USE}
+"
 
 # the test suite is messed, it uses system-installed samba
 # bits instead of what was built, tests things disabled via use
diff --git a/net-fs/samba/samba-4.8.0_rc4.ebuild b/net-fs/samba/samba-4.8.0.ebuild
index e1772d73e9b7..946396955361 100644
--- a/net-fs/samba/samba-4.8.0_rc4.ebuild
+++ b/net-fs/samba/samba-4.8.0.ebuild
@@ -103,13 +103,17 @@ RDEPEND="${CDEPEND}
 	!dev-perl/Parse-Yapp
 "
 
-REQUIRED_USE="addc? ( python gnutls )
-	test? ( python )
+REQUIRED_USE="
+	addc? ( python gnutls winbind )
 	addns? ( python )
-	ads? ( acl gnutls ldap )
+	ads? ( acl gnutls ldap winbind )
+	cluster? ( ads )
 	gpg? ( addc )
+	python? ( ldap )
+	test? ( python )
 	?? ( system-heimdal system-mitkrb5 )
-	${PYTHON_REQUIRED_USE}"
+	${PYTHON_REQUIRED_USE}
+"
 
 # the test suite is messed, it uses system-installed samba
 # bits instead of what was built, tests things disabled via use