gentoo resync : 18.03.2018

15 files changed, 78 insertions, 53 deletions

diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index 28980b2497bb..5507b31121ed 100644
--- a/net-fs/Manifest.gz
+++ b/net-fs/Manifest.gz
diff --git a/net-fs/cifs-utils/Manifest b/net-fs/cifs-utils/Manifest
index f6ef481901b7..9dce197e044b 100644
--- a/net-fs/cifs-utils/Manifest
+++ b/net-fs/cifs-utils/Manifest
@@ -1,9 +1,9 @@
 AUX cifs-utils-6.7-heimdal.patch 904 BLAKE2B de816117010e71ced5ad094e8ed3537b672b37a0e8ac0b999aa7aaf180ac051f6745ee68373948b266ad359e1ba3b58552eda6314b5a4339673bd04656ab6090 SHA512 e3364e05fba6aff57ea2f09b530692f4f5ec95213e91794388fff9382d210db9bacb28dae1440d3b35a570c0b3bc21084a067e0ce8333febd5246c52aa9260ae
 AUX cifs-utils-6.7-talloc.patch 857 BLAKE2B 3ffefe40f18db87992bf3a2816bba690251f3dc93f78e998acfebbff450c20072679e4ee7fdb9fe22e835d4a7cf8f3bb43cef887fa54d7a70d6bbbf7dd8ef1b8 SHA512 c1e64736ec7735213a66b9c2514667244e5dd78531c899b7e10ff93acfed8395ad970b9b2dac929d7894feff3cfc0f46c6693df244557dbb9d2f2f8939ccc8f5
 DIST cifs-utils-6.4.tar.bz2 392809 BLAKE2B 90d59cbc49e6d3cf427a43fd9deedc8ea8150e6c8a3ed93ff815445897e4a524785dd342e0547a651bd67de4495e09c6384d6b36c3ed01f9d532c6d533c9efd1 SHA512 05860ceed1e83b4f4da689d2fc1c1b48fddc0ca53ba52fc6cf26a277d6a884f5780060725c5df1401a665ac35ec5a170262ee62f61095e4a8d76348888182614
-DIST cifs-utils-6.6.tar.bz2 401831 BLAKE2B 6a073d35911b74ea36ffda32dd3f5d6032c3d46d846419b641312d1571ac448777ab5f70fe8dcb7582ab782014f0cb52ab620e60239f2cbd5d05284620cd18ab SHA512 0059c85a9faeff4bba052a9bfc672baa658a923e03304dfb0c51f427079afc6effb2f83d7d09cdcacb2c8a30cdfccd3946957b1616790f5ad3ae2300f161458f
 DIST cifs-utils-6.7.tar.bz2 363647 BLAKE2B 692c4b7de92c2cc5cb88591fb5b5b01ca7d925b105d10f7149e350d1b1661bb6447e71e0ca86095a9e294637d80126e54295413a685786b62c8e70cf26f893d0 SHA512 ee050a0eb4a72fbc8d773e86fbe6839ea2bf11cda5ebd071c8ead66e31b46d50ea4e1d1b26478373be53227cd60b32a90b65b5cb989b5a8237cddfc65bad8e5e
+DIST cifs-utils-6.8.tar.bz2 384426 BLAKE2B 002518f44489aefc94c47a23438b176a4056ff4d995b3ed9f25a6c6c8d4c8d7437a3158d5c592d16cb6bfcd289b937d6ac1ef0573c346993d576a88aa1fcb118 SHA512 54a094f78c9e07acc997adfe0c8d4c2fb8e15c18adcc1805450e2180f8539aaec8619e781e985b289e097932637e2de3e6815e32f59ec2fc06cfc3762b832e13
 EBUILD cifs-utils-6.4.ebuild 2974 BLAKE2B f469c0c94f3cba69c8847ffe956e23ed0525ac01360e4e966e73a83680d732251f0fb418df3f5b853bfa13ee1935e77eb6ea92220beca8939edf1437cff0d5c1 SHA512 c5c12c57c322a2a87f03426a2d08f1fe1e69213efbc4463b04b5d2b60ca1b06578a018336666b5a2f4213c3681d1d1ee3c35df4b0bdf802e4a1e564d423ee4e1
-EBUILD cifs-utils-6.6-r2.ebuild 3090 BLAKE2B bab892fec42c06099b946269c4d1c3f3f42cf66c4040ec57e2140b5462edd6b8e5646f190df1d308f371d0da163c5809592bfa3c16eed5ccec2f7191992c5aa1 SHA512 5cd30a1f79b430fa846fd54e21bb8c47b1ad34fcafe21063fa4e95373bf045d3e9aa90f4ae6e211b255e8144bdb18db023e5784573f779e5dea8fc61c3243447
 EBUILD cifs-utils-6.7.ebuild 3246 BLAKE2B 16a9f84df376f6b9f427e0212abf15ac34abf1020507e6c8a92de0a2673f1012f43c05d2dde23bb4f5d0f811d5de1e58fdbcecfd8b3277731f5f00ddaf8fe040 SHA512 dc2153bb30d70e7626d511130fba8aadafc54c5b8dbca6c258763e65779e3a0cc1d6e684d4c0c531fabb4ee824b0f33a771af8b0b03e203c7ecf614e12d2b6e9
+EBUILD cifs-utils-6.8.ebuild 3230 BLAKE2B 73e27d0cd239fc82c440d299a3a3ef07e4a4ad244e2980f0526e2ee8aa12b46e70fd46f66eaa587674a1c9bc2d0b02ba98f9943d38fbcb5a2db5a57bf1d82852 SHA512 311e7213a58ddc8df71ecf9ced69af3014de41465f57b8b46dc6bbe334b1a78199afbf142a74869087fd5bcb78d98feb55704f004dec65b61da2f04eac15f26c
 MISC metadata.xml 889 BLAKE2B 45b3f5f6cac2ca247c9d3a73d4f0e2703187e4a4eab2f850ef2f228489e365ac30d67d35187fab993af7611109c0e2a33bf8336e37496a131b641abade642ca7 SHA512 979960233f0941ecbfa1cadd79fae28898cf8f8333225483808cd25b84d0395d9a7dbc84a5912c2dedb38269d62b7d7f4a647b5d12e47b7706368b3640d90c66
diff --git a/net-fs/cifs-utils/cifs-utils-6.6-r2.ebuild b/net-fs/cifs-utils/cifs-utils-6.8.ebuild
index 0751c696946d..63b3e7afe463 100644
--- a/net-fs/cifs-utils/cifs-utils-6.6-r2.ebuild
+++ b/net-fs/cifs-utils/cifs-utils-6.8.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit eutils linux-info multilib pam
+inherit autotools eutils linux-info multilib pam
 
 DESCRIPTION="Tools for Managing Linux CIFS Client Filesystems"
 HOMEPAGE="https://wiki.samba.org/index.php/LinuxCIFS_utils"
@@ -24,15 +24,11 @@ RDEPEND="
 	)
 	caps? ( !caps-ng? ( sys-libs/libcap ) )
 	caps? ( caps-ng? ( sys-libs/libcap-ng ) )
-	creds? ( sys-apps/keyutils )
 	pam? ( virtual/pam )
 "
 DEPEND="${RDEPEND}"
 PDEPEND="
-	acl? ( || (
-		=net-fs/samba-3.6*[winbind]
-		>=net-fs/samba-4.0.0_alpha1
-	) )
+	acl? ( >=net-fs/samba-4.0.0_alpha1 )
 "
 
 REQUIRED_USE="acl? ( ads )"
@@ -54,16 +50,29 @@ pkg_setup() {
 	fi
 }
 
+src_prepare() {
+	default
+
+	if has_version app-crypt/heimdal ; then
+		# https://bugs.gentoo.org/612584
+		eapply "${FILESDIR}/${PN}-6.7-heimdal.patch"
+	fi
+
+	eautoreconf
+}
+
 src_configure() {
-	ROOTSBINDIR="${EPREFIX}"/sbin \
-	econf \
-		$(use_enable acl cifsacl cifsidmap) \
-		$(use_enable ads cifsupcall) \
-		$(use caps && use_with !caps-ng libcap || echo --without-libcap) \
-		$(use caps && use_with caps-ng libcap-ng || echo --without-libcap-ng) \
-		$(use_enable creds cifscreds) \
-		$(use_enable pam) \
+	local myeconfargs=(
+		$(use_enable acl cifsacl cifsidmap)
+		$(use_enable ads cifsupcall)
+		$(use caps && use_with !caps-ng libcap || echo --without-libcap)
+		$(use caps && use_with caps-ng libcap-ng || echo --without-libcap-ng)
+		$(use_enable creds cifscreds)
+		$(use_enable pam)
 		$(use_with pam pamdir $(getpam_mod_dir))
+	)
+	ROOTSBINDIR="${EPREFIX}"/sbin \
+	econf "${myeconfargs[@]}"
 }
 
 src_install() {
diff --git a/net-fs/davfs2/Manifest b/net-fs/davfs2/Manifest
index 9126e84c2f7b..f3023f3c471b 100644
--- a/net-fs/davfs2/Manifest
+++ b/net-fs/davfs2/Manifest
@@ -1,3 +1,3 @@
 DIST davfs2-1.5.4.tar.gz 478377 BLAKE2B 25c7dba1a6cda384a60c8ce2e0a56d5c805f5c30f35f086bfe1f55ee4eb79b8228beca2e7214e9858a1c49c8f782c6de8f4f0631cf0e2090991a0e35ba5d8ed2 SHA512 08550f171f4b196f55f3fb71c6c75ed24063f8a5afc31c52502d0c911cf7aca4da01f7a123269d410dadc497c44ef5a3573e455aca6eafe48eb86f18429b94b2
-EBUILD davfs2-1.5.4.ebuild 958 BLAKE2B 8418fd914bfbed344681b719f2493ea7efee2259a2608e526c41c82499ee96f2940e3acc249fba3f5a38a1dfa5b6d4fc0b6b7dadd9526c8dc9a5f5b27b2f1479 SHA512 7b1b638d70fdbde8415b078b4a3f98e5d810b4cfb8b79c6ddf4e3f2a938203c1ed26807e3303063e387c10dd991986595a4f8727ab3300996d51d8cdcb7a3587
+EBUILD davfs2-1.5.4.ebuild 963 BLAKE2B 8d3d90d343aad9165f1bb0101fe3c8f79a4bc67246971b5a4c7ba018ba5e9d3ef9208cee0ef9647652d2c25cfb0dc80e4f0174c9f40ea92dd84157962935a54a SHA512 2d437012f6c6c96ff85bebbfc90ac60b967a7500fee0403676cb6e0579f3e20e0050e00077d3e1ba68c308086d6a4fca662a3f1531de5a3d001d0088b72941c0
 MISC metadata.xml 251 BLAKE2B 50ac338c9f09535de32ea2a1300195c358edff81cc3517de13846dbbc8b34331fa634e33633828beefb727a53bce0299ed784f4d0e18c07c977abfcfdd312074 SHA512 6d9ef84f36e3ce79747ee806d0194543d1c5a004e612ecbe308644829cf03234d7f52ef0dbbe57144da5d4af86e3a9a5df297a01c95c4d9938f49605e92aea32
diff --git a/net-fs/davfs2/davfs2-1.5.4.ebuild b/net-fs/davfs2/davfs2-1.5.4.ebuild
index d786cfd93205..40f41a2c4a0a 100644
--- a/net-fs/davfs2/davfs2-1.5.4.ebuild
+++ b/net-fs/davfs2/davfs2-1.5.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 ~arm ppc x86"
 IUSE="nls"
 RESTRICT="test"
 
diff --git a/net-fs/libnfs/Manifest b/net-fs/libnfs/Manifest
index 39830293fc91..b22f9bf20dd6 100644
--- a/net-fs/libnfs/Manifest
+++ b/net-fs/libnfs/Manifest
@@ -11,6 +11,6 @@ EBUILD libnfs-1.11.0.ebuild 1076 BLAKE2B 6eef0f8a3dded31ab549e592d922821655f28cc
 EBUILD libnfs-1.9.5.ebuild 1104 BLAKE2B 35d57e11ee8bee13296749d1ffad4538b900c26be337e55ebf7ffdaf8cba6439859d11154c0767c02fe500b4e1ed68eef789a2b24d977c829b2b3ee6f676a620 SHA512 ab70f6ec1e3e80aeaca04a8c01c8a27d01bb2ff3bbfc0f656f4d70a9a7db73ab7c385c8a292aa5cbbc6f4517de9c52f385c66010de1775f28e36af2a69a2fbb6
 EBUILD libnfs-1.9.7.ebuild 1065 BLAKE2B f90f578433b843bdb46fa0620258d5c2e51517838d664fe8168145af224431ff258bf13c784babaacf484bb69b30e2e491b2e5bdb6fa3671ef205c72c16caa9e SHA512 27c789939b00ef3864474fd16ea24e337d53859c35ff0479b302d47ddea6e6e3d9321048be473602df865834248122c4232c72a6996a14a00b16c8bdf8641a60
 EBUILD libnfs-1.9.8.ebuild 1076 BLAKE2B 6eef0f8a3dded31ab549e592d922821655f28ccb19c55b7d832f10f6b10a6b4226d5716b2927fb47fd6d04841c193f8ffe51aa7fe00022b5ee8e63f15ae07bb7 SHA512 a98406e2047ef0f1f841af6874358125f58c12aef62f47d5259c5d38fd842c68807675d93f53a771d4bd11b1fe712df404ee074e64b694015e26b72efb10acf7
-EBUILD libnfs-2.0.0.ebuild 1112 BLAKE2B 70e41f77fc1f79e810d596c3f10d22c9dacd7825203da43606875246e6e425693f6cac37b93de9fa7f518ff16c2390f550ef6c872b62eb1ec08f1e86904b778e SHA512 3576789ec81a70b16cd179a51fb8d562dbe69f78dee5fde56f833bf85d0d375fff09ce160b60b9f77f58c2f72dcca1ed27b7399b326f632778b95ac1b5995d1a
+EBUILD libnfs-2.0.0.ebuild 1111 BLAKE2B 3f581a63c113a9fa53ecc2c73a2dec9440f5d26a0223483a7cdec32d1495c72a91fff70425f436d7eebe9fab7b6ac207a29944313cbc2bc5d28614ce43003654 SHA512 822f244aa510839aae50d3526452df9ff35ca1476de6e6b81112f5053a79b73f74a678613f863bb22a227d96f62e06b6f1336ba549a8055fc4bb14324216dad9
 EBUILD libnfs-9999.ebuild 1118 BLAKE2B e0921c1767a521d3366ffc7318b4861ea7c1b8186c09e880f7520a1a4bedf705a9eb924e4a874cd33f3738e4f24b8a414459d263c166441447b22f6ed7b292ad SHA512 0bca1722a17557667b9c7c6996fee9fe98ccfeed7d9d74db0af1d265b99cdb2668c3a934398648c9615fd970972bad79234b28580bccee3a38eed934bd5ad7e0
 MISC metadata.xml 337 BLAKE2B 0e7e5918d79634937e9d1ad6289fab93b11ff6330b554c52e76148120974b58cf586669ccfa579daef54d8b8b23a51b623582c50839ca8f6182619c1987ac368 SHA512 aabcd286aba9ba93d7e64759ef0fb49b4d5ac99182453b2bf68727d0f41638640d312355465b8862b4f070f5bd47b1debbca635a07d7e44dde841da99405206d
diff --git a/net-fs/libnfs/libnfs-2.0.0.ebuild b/net-fs/libnfs/libnfs-2.0.0.ebuild
index c576a6636dd8..6de4c452dcc4 100644
--- a/net-fs/libnfs/libnfs-2.0.0.ebuild
+++ b/net-fs/libnfs/libnfs-2.0.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-2
 else
 	SRC_URI="https://github.com/sahlberg/${PN}/archive/${P}.tar.gz"
-	KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh x86"
+	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh x86"
 fi
 
 DESCRIPTION="Client library for accessing NFS shares over a network"
diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
index ab224087bb45..5dca004afd2a 100644
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -29,5 +29,5 @@ EBUILD nfs-utils-2.2.1-r1.ebuild 5399 BLAKE2B a44119f006ec1123ea235478ad0425a5dd
 EBUILD nfs-utils-2.2.2_rc1-r1.ebuild 5378 BLAKE2B 8e5cd7e2de1546fd148a7c295c4ab9830e7c250dee1ee5862ae8501075bdf0abf894362cca6954b05d69e2149f781420e0084b9bfe90e2c8c8662810546cb0c8 SHA512 85326df8b59fd0bfe1d0b862fe9270704fc69e05183ce4f9662e8af12b9033681ad70593336b29e5050e2d0bf14f6721787b59c1927064a1c53bed88d2d8679c
 EBUILD nfs-utils-2.2.2_rc1_p20171107-r1.ebuild 5263 BLAKE2B 9edaccda54726385d778c22cf70c13e7532ba1c49ef7593dc0aec5e17376ca3bca0732a1a8182e753791313426c1c838d8e47baeba2bd904a0439c4154660a07 SHA512 043e4a3d76bf7e51d4199c566ac2dde2567715f24af27354672263d68572b500a8a1adaf34dfd6572fe833181761d8e9b84db0edf15e9b7a7bc1995961eb2d10
 EBUILD nfs-utils-2.3.1-r1.ebuild 5440 BLAKE2B aba69b2b931c7414d6ec266b6bc6bb38d105e0006c85c3ca66289d6e0dd10a5a229ca2516a75186fc1b82f3c8fc4b457010f34da42be90cfffa067efbaa785e1 SHA512 0774440f9e4d862122dd80d90d0d8b03d75e4cc2b898bf426c35fb5a80e19a237c682c040ffeda716c6335b4b7e57376d14f89825eca3410b591ec7112d1ca2f
-EBUILD nfs-utils-2.3.1-r2.ebuild 5231 BLAKE2B 00daee1661b5dc2872b468e03f70fc81bd0b8b42a22a44548c1e637afb1d6deeb52683c0f7ad2e04e90113aeacddb28b8c1a3ce3589dcf13b31adaa6480e9fe3 SHA512 5bb05121946f2b3f36799b65435f4e5334e13159013ffcf0228261b7eea30a34b4c3bb2bd948b17913fadb065ce24d9d9221a925c860b73c7b2dc228d5577629
+EBUILD nfs-utils-2.3.1-r3.ebuild 5257 BLAKE2B d8f2b932076e1b8b47a6b8c416b7394986bfce167adf3952b7ea55e0b66f189d3cde06332e980065bb36c0b82a669f9a2f73b6dbdb5357a6da7b38408ea5e572 SHA512 917948e8d03597a39c3acad5e3e5cc7ca55b97d0a5e5c37b0bb04101465be9e207210e020a6320697f7fae8128b0c86443c7c1a5bffe47fe759c9c7d09c317b0
 MISC metadata.xml 861 BLAKE2B 14c4f9e530e9c3a695f615d698f7a96d1252c14936849a846536790059c79f992c79246028b1945f496fda813891e1079ef0a6ad3411d18e0ee8ad9b6e0315c3 SHA512 21e7e63ddddda196f114b98b6ae2c67abe9cbabf91d60ab7877b34ed96e749c0ea167169c6ffa0502c80f993bbd2243db7bf544b304900a07d2b6c84141d1cf5
diff --git a/net-fs/nfs-utils/nfs-utils-2.3.1-r2.ebuild b/net-fs/nfs-utils/nfs-utils-2.3.1-r3.ebuild
index eba1ec16fe9a..9e7f359734ea 100644
--- a/net-fs/nfs-utils/nfs-utils-2.3.1-r2.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.3.1-r3.ebuild
@@ -15,7 +15,7 @@ if [[ "${PV}" = *_rc* ]] ; then
 	S="${WORKDIR}/${PN}-${PN}-${MY_PV}"
 else
 	SRC_URI="mirror://sourceforge/nfs/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
 fi
 
 LICENSE="GPL-2"
@@ -81,22 +81,23 @@ src_configure() {
 	export libsqlite3_cv_is_recent=yes # Our DEPEND forces this.
 	export ac_cv_header_keyutils_h=$(usex nfsidmap)
 	local myeconfargs=(
-		--with-statedir="${EPREFIX}"/var/lib/nfs
+		--with-statedir="${EPREFIX%/}"/var/lib/nfs
 		--enable-tirpc
-		--with-tirpcinclude="${EPREFIX}"/usr/include/tirpc/
-		--with-pluginpath="${EPREFIX}"/usr/$(get_libdir)/libnfsidmap
+		--with-tirpcinclude="${EPREFIX%/}"/usr/include/tirpc/
+		--with-pluginpath="${EPREFIX%/}"/usr/$(get_libdir)/libnfsidmap
 		--with-systemd="$(systemd_get_systemunitdir)"
+		--without-gssglue
+		$(use_enable caps)
+		$(use_enable ipv6)
+		$(use_enable kerberos gss)
+		$(use_enable kerberos svcgss)
+		$(use_enable ldap)
 		$(use_enable libmount libmount-mount)
-		$(use_with tcpd tcp-wrappers)
 		$(use_enable nfsdcld nfsdcltrack)
 		$(use_enable nfsv4)
 		$(use_enable nfsv41)
-		$(use_enable ipv6)
-		$(use_enable caps)
 		$(use_enable uuid)
-		$(use_enable kerberos gss)
-		$(use_enable kerberos svcgss)
-		--without-gssglue
+		$(use_with tcpd tcp-wrappers)
 	)
 	econf "${myeconfargs[@]}"
 }
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