gentoo resync : 30.04.2018

14 files changed, 143 insertions, 35 deletions

diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index 86616b3857f2..91d04a3a1059 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 111114103bfc..3ce9fec7e1cc 100644
--- a/net-fs/cifs-utils/Manifest
+++ b/net-fs/cifs-utils/Manifest
@@ -4,6 +4,6 @@ DIST cifs-utils-6.4.tar.bz2 392809 BLAKE2B 90d59cbc49e6d3cf427a43fd9deedc8ea8150
 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.7.ebuild 3240 BLAKE2B 9fddd9c06a2b558094d127f7151b000b07f43e8b419d12fd7709748d4b32b84bc4d557ca605796c2045ab6c3c512ef6bc42acc937c591a3bdc513763ed671d4a SHA512 6fe2c009019dfd307ce41296694488a5226bd7e3a36a5c2a29d8954cb2bf4a9c3faa7885917eb4531ac51c654d72118a600d1ef12623b834dd7b99e9ca316afa
+EBUILD cifs-utils-6.7.ebuild 3239 BLAKE2B 22f48e5a904906536afc98750e15a8251d70af10f2340c9abecc2bb86f44dc3a57ad95b8f59f9eec9c26376f0db697729e4f09f9c6c5af9aa21499982266acf2 SHA512 b64cfe3dca6b8bcf0acc0f191a3ec5a6a4523ab57cf0908578beff855232cd655a6f33c95bc96314b3ba995e1075762ded62c664cba28cf1c27a886f00d8bcbc
 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.7.ebuild b/net-fs/cifs-utils/cifs-utils-6.7.ebuild
index ec398377a12f..b7b7e849783c 100644
--- a/net-fs/cifs-utils/cifs-utils-6.7.ebuild
+++ b/net-fs/cifs-utils/cifs-utils-6.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://ftp.samba.org/pub/linux-cifs/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~arm-linux ~x86-linux"
 IUSE="+acl +ads +caps +caps-ng creds pam"
 
 RDEPEND="
diff --git a/net-fs/ncpfs/Manifest b/net-fs/ncpfs/Manifest
index a5fd6937ca3f..3433c5bdd8e8 100644
--- a/net-fs/ncpfs/Manifest
+++ b/net-fs/ncpfs/Manifest
@@ -19,4 +19,5 @@ AUX ncpfs-2.2.6-zend_function_entry.patch 296 BLAKE2B 3bb6db87517e0fb086e95462e9
 DIST ncpfs-2.2.6.tar.gz 2100545 BLAKE2B b95c8c0b097227c7b9e526e978efdca2234cdd0833468be99abaa68b0feba09794be26ebcb3a1c3371bc99f6c9d007eee164fa5f918aaee3eca44aeb1420211f SHA512 51f85eaae85deb66cea2ff434974699f6aa45ed1ed75217ef6176ac0b7d0f9f1c4fb186afc64c1b495474d5bad9ac7614033128c0bec39c05de723a9b29c8602
 EBUILD ncpfs-2.2.6-r3.ebuild 2604 BLAKE2B 3c768032c5ab48cafa7955330bafccc00816fb07b0d4d06049e590ddb2079a9506df3e0de694e8022cab705a6bdab8c43c5122f4d8bcbd80ceb16cd5ebfe79c5 SHA512 c81d58564071787615b572ed360230ad2fa2d8030a2a8aefa778467b7be7d9726c5556bb7faad3f73e7a92341a33aebc61cb812a951d9f7c2970424ef733b976
 EBUILD ncpfs-2.2.6-r4.ebuild 2449 BLAKE2B 02c2bbf4cea12348b64b1c584bee9b0b0e1c5fd688968b17799c8664b676d8e7205d6d33e025a6ec40a2485153649d774a8933196dcf448a76e59416394e4053 SHA512 46cf6f9b1968528649df09596d097b7f775fb2ac61e69ebedce78bb7ae0c7c1622d3febc9d25245278de73c938edf488f99712dac5c7db4aa4a3f150e83830e8
+EBUILD ncpfs-2.2.6-r5.ebuild 2338 BLAKE2B 9b73d48b5adc7f5ef2e6421107160d5c7acc87ef64d47ae2af1012a110eaa6c169df4fec37ba5262772649bee537d7e9e0d9aa2bf30119b94a3a758bb01c8cdd SHA512 258aa32e307f6410b7d3461d0a24a54c86cc275730ef748e3bad54370f1114de7594d37731adb314729bf77ab1b2f470e848374ccc343d8a81382049300feb0d
 MISC metadata.xml 376 BLAKE2B 33c2a81c2a97ae39b1f66ae00a81dbc58144f8f264f31235f95852c70dadfd74ae8ab3db92bfed910354598d4f50e1ce0de546eef7fc2db3717158294fdf79e7 SHA512 dacdb06d762397d05a6ba195648173ddd13822bc020fd0c8ed12148003e9ee651636f162860c5aace8e1182111da4082d2c509a20e8523bd8ed05ef04c51afec
diff --git a/net-fs/ncpfs/ncpfs-2.2.6-r5.ebuild b/net-fs/ncpfs/ncpfs-2.2.6-r5.ebuild
new file mode 100644
index 000000000000..14c992bac3a1
--- /dev/null
+++ b/net-fs/ncpfs/ncpfs-2.2.6-r5.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit pam
+
+DESCRIPTION="Provides access to Netware services using the NCP protocol"
+HOMEPAGE="ftp://platan.vc.cvut.cz/pub/linux/ncpfs/"
+SRC_URI="ftp://platan.vc.cvut.cz/pub/linux/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~x86"
+IUSE="nls pam"
+
+DEPEND="
+	nls? ( sys-devel/gettext )
+	pam? ( virtual/pam )"
+
+RDEPEND="${DEPEND}"
+
+MY_PATCHES=(
+	# Build fixes.
+	"${FILESDIR}"/${P}-gcc4.patch
+	"${FILESDIR}"/${P}-missing-includes.patch
+
+	# Add a patch to fix multiple vulnerabilities.
+	# CVE-2010-0788, CVE-2010-0790, & CVE-2010-0791.
+	# http://seclists.org/fulldisclosure/2010/Mar/122
+	"${FILESDIR}"/${P}-multiple-vulns.patch
+
+	# Add a patch that removes the __attribute__((packed)); directive
+	# from several struct members in include/ncp/ncplib.h.  This will
+	# cut down on a large number of compile warnings generated by modern
+	# gcc releases.
+	"${FILESDIR}"/${P}-remove-packed-attrib.patch
+
+	# Misc patches borrowed from Mageia.
+	"${FILESDIR}"/${P}-align-fix.patch
+	"${FILESDIR}"/${P}-getuid-fix.patch
+	"${FILESDIR}"/${P}-pam_ncp_auth-fix.patch
+	"${FILESDIR}"/${P}-servername-array-fix.patch
+
+	# Misc patches borrowed from Debian.
+	# Fixes Bug #497278
+	"${FILESDIR}"/${P}-drop-kernel-check.patch
+	"${FILESDIR}"/${P}-drop-mtab-support.patch
+	"${FILESDIR}"/${P}-no-suid-root.patch
+	"${FILESDIR}"/${P}-remove-libncp_atomic-header.patch
+
+	# Support LDFLAGS.
+	"${FILESDIR}"/${P}-ldflags-support.patch
+
+	# Bug 446696.  This might need re-diffing if additional Makefile
+	# fixes are added.
+	"${FILESDIR}"/${P}-makefile-fix-soname-link.patch
+)
+
+DOCS=( FAQ README )
+
+src_prepare() {
+	default
+
+	# Bug #273484.
+	sed -i '/ldconfig/d' lib/Makefile.in || die
+
+	epatch "${MY_PATCHES[@]}"
+}
+
+src_configure() {
+	# PHP integration no longer supported in Gentoo, per Bug #582516.
+	econf \
+		$(use_enable nls) \
+		$(use_enable pam pam "$(getpam_mod_dir)") \
+		--disable-php
+}
+
+src_install() {
+	dodir $(getpam_mod_dir) /usr/sbin /sbin
+
+	# Install main software and headers.
+	emake DESTDIR="${D}" install
+	emake DESTDIR="${D}" install-dev
+
+	# Install a startup script in /etc/init.d and a conf file in /etc/conf.d
+	newconfd "${FILESDIR}"/ipx.confd ipx
+	newinitd "${FILESDIR}"/ipx.init ipx
+
+	einstalldocs
+}
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 55932f5ba261..63a30bb3f980 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -28,12 +28,12 @@ DIST samba-4.7.7.tar.gz 16875059 BLAKE2B 05ecf13562e847070498e923df0cc85836b2fb9
 DIST samba-4.8.0.tar.gz 17659751 BLAKE2B 389d7b6039a00734b514eb017bb201f119b8b894b98af4387ac3186a082b2de295e78b58e96539b93433d3d850e9be19f6ef9a63f66fa9a330f3a88d25b28a03 SHA512 64ffbddb6cf9eee00e5d67a471387b81759c3b4bf67793083aa021e232c8321182182eb9c642b9c25fb1a488f135dec34f7e092d286f94836c488022f8a15c01
 DIST samba-4.8.1.tar.gz 17675747 BLAKE2B 109692c46e87bcf8a0573c8523943e31086665f6683e4fd634dc5ed93d71da15f82c5354b10883067ea662f947e49b7139208490ae482df6fe3a8209ed77341e SHA512 0c48ca0efc2b5b456e4c77ba7d21cacda9e02534e9715b07f712951e47af1959deb3e30d733324b997573feb1aefd81d1eec1c0b691e417a89d81f302ed9e568
 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.16.ebuild 8098 BLAKE2B cf69d4455596d6bce7f71ddcda1e61b76d4bcf5b1e60f1d094a12cbeff0e3f9259c3e149b4866df60dba9d6001bcb5f52e92fff1130669bd2ba5e683cd54d802 SHA512 7cd783f9bd03c7874517b04990638077a146d34b668a87f95e9c1d5208e50859bd6a12d9702a33f8055b4bab262a07df6267b2e7f58311dda919aafebb966f9d
-EBUILD samba-4.6.14.ebuild 8662 BLAKE2B 9c17e3e4b11f15acba081bfe97dba553939ef98579c1957b40b776f3baf0858c09e6a242b384517395a42f7f5d40c686fb7d3c8483c2a072045ca25339affb3a SHA512 96e049e48d45de3f861207eed2a891831f870a1dc59006e36a0b5b7e296e45173ed1f1684a1fcc9c7a08863cd428565780cde5809a10c1fef62e263dcb278383
-EBUILD samba-4.6.15.ebuild 8662 BLAKE2B 9c17e3e4b11f15acba081bfe97dba553939ef98579c1957b40b776f3baf0858c09e6a242b384517395a42f7f5d40c686fb7d3c8483c2a072045ca25339affb3a SHA512 96e049e48d45de3f861207eed2a891831f870a1dc59006e36a0b5b7e296e45173ed1f1684a1fcc9c7a08863cd428565780cde5809a10c1fef62e263dcb278383
-EBUILD samba-4.7.6.ebuild 8716 BLAKE2B 12106f6a53f79b903a9dcf3091b6ebbc85ad91deb406cbda789d02c50f2ec9301edffce9c2dd1ec12daa0e4130f5cd383e04e547573d487d3c6cbee4ddba16da SHA512 444f4f768c02376fc6724e841aeb0650411bed49643f38d41c143ef9180e115a6bc90b6ff84a00970bcc58036c14385b88fa11646be1dbd56d360c460094685c
-EBUILD samba-4.7.7.ebuild 8716 BLAKE2B 12106f6a53f79b903a9dcf3091b6ebbc85ad91deb406cbda789d02c50f2ec9301edffce9c2dd1ec12daa0e4130f5cd383e04e547573d487d3c6cbee4ddba16da SHA512 444f4f768c02376fc6724e841aeb0650411bed49643f38d41c143ef9180e115a6bc90b6ff84a00970bcc58036c14385b88fa11646be1dbd56d360c460094685c
-EBUILD samba-4.8.0.ebuild 8360 BLAKE2B 7efc77fb7e4e56b990a130a2c8cfcd42323cb12ebf3c75df4380fa33acc9a4d38b66222ee3cfd3c8de0e3c1978f8c7c00a4459117046cd5ab175afa0ce78e7f2 SHA512 50efbb207cf31c7629531bec96d647855836fc264a227505b240127fb1cd933e362576f4bbca8f813a436128cd5582d51b013c6b88fe212718cec561c72de4c5
-EBUILD samba-4.8.1.ebuild 8315 BLAKE2B dac053d5b38da5bd9e85b09d55743860bdefd3262d26ce908d85defba3b60a3907af100e5aad272a686f659284f95f53c6cbb1967b391a375a3ce369a24434b8 SHA512 461a20fe9e32517570cf3194c24b1b37e8bb715b02470ebee1a32f92491f791cf39df60bc5f5c460d1bd621f52db7a84565506e9efa4e989de8e4baba1153023
+EBUILD samba-4.2.14.ebuild 7132 BLAKE2B ee27661acd563a422d8aed6606fb9a4c94f30c760d68aba5f6edd6a4d6f79c07b2cec43f2045e9a3a63bbcd57a98c6595b2e1ca1cf5c493c7bd3d006b81eff65 SHA512 7b526b35a6b03b4588761eab416a58683184c4e7a0b376a632809f4ed4004775e94558ba323fb79a3fab0f11720d038a2718dd68e7443217c2974ad0f194ebb4
+EBUILD samba-4.5.16.ebuild 8163 BLAKE2B 5425cd0deee01d5bd2ea33ce1e3e3c826f21ddf73050d653b90216b8797e15528706abcce5850eade5eaf3a1baad3456e6344146979e2baba110c3e53520d5da SHA512 d595cc925dd4d8aca99d0b0b2b0bfa77a265c8d1df345fe22acb1a56e1dc1db6fdefc7f6cf49b9147cbef54f8eb1d7172f896906217394871f7f91d8a924646d
+EBUILD samba-4.6.14.ebuild 8728 BLAKE2B 522bb8590e18c696853fb2e87106c8275cd855b330660c25918d754ab0ac9013b28b1517af7147cda64135958cd0a79087b5ff7365e48b20eb5d1c6f0cdd6460 SHA512 4d48c665ee9708cdc3fbd290c56e6eba41cf878a2f4130f994bbfdc5ea6194a98c286cd5ee0ea7f9c41409bf783acf395add7ad36491d223742ed816bf6b2652
+EBUILD samba-4.6.15.ebuild 8728 BLAKE2B 522bb8590e18c696853fb2e87106c8275cd855b330660c25918d754ab0ac9013b28b1517af7147cda64135958cd0a79087b5ff7365e48b20eb5d1c6f0cdd6460 SHA512 4d48c665ee9708cdc3fbd290c56e6eba41cf878a2f4130f994bbfdc5ea6194a98c286cd5ee0ea7f9c41409bf783acf395add7ad36491d223742ed816bf6b2652
+EBUILD samba-4.7.6.ebuild 8724 BLAKE2B 72fd87b0411656a99a43382d6c7a72741c1751aad5277d5a969887656fb98e301c5f831b3bc51986f776f273e16208450c65d226482c8691d3f1b174bd154afb SHA512 9db5c86a3c208a9336057411a944b63cfed811cf5115e26746fff4511fbe2f7fe7ecc5fb41443489873aaa7703987df4381bcdefa044208c718f8d3ce5274afb
+EBUILD samba-4.7.7.ebuild 8724 BLAKE2B 72fd87b0411656a99a43382d6c7a72741c1751aad5277d5a969887656fb98e301c5f831b3bc51986f776f273e16208450c65d226482c8691d3f1b174bd154afb SHA512 9db5c86a3c208a9336057411a944b63cfed811cf5115e26746fff4511fbe2f7fe7ecc5fb41443489873aaa7703987df4381bcdefa044208c718f8d3ce5274afb
+EBUILD samba-4.8.0.ebuild 8368 BLAKE2B 965894008bcc788976eaa36f721150e055cafe4f2a86a979164fe1c767b13b04927865413176702b40dfcce2aaee57cd2c0fda7f1f0b12cb105a0314d9b8ea69 SHA512 e058aa26df5be757d089b6b1a0f1c94cf15c3cf5ccf603f70c0f10c7581ead6f4fce0663872e20437d33e9ea1ce5816a92c72d0c00c7dd119d72d34d4707dcf6
+EBUILD samba-4.8.1.ebuild 8323 BLAKE2B 808c5b997a723a9148798be098171d9d44d493aac64bd042c5b4b30426395d2766c90a0bacfcb08017828c30826a8531ae4a00e3e5224fc6d074aa6db2a86d5c SHA512 a89ee5a24d7989a2effe655d536a4472b223010d437c9bec3b3a212f752ba79a58941e8c4879bf5c4f5fd9b04773a71f1471e09eeb7e8236a60a20885d2f93c2
 MISC metadata.xml 1641 BLAKE2B d360b1d43e278d71dfcaacd749a730a55998a3f7e7676a113015eb93c1a30480f237705d93b8d22d0733a852bbe320397fcabe2d9c517330c1a24aa0e47ca1c6 SHA512 9e6bf4cb2b711f48a3f730f2e4e9cc8c460b46013fe78ad376855748bdff0d8e44beb05798de551c0c22cd2b40d74c2c30799393d05bd7c7a9161a74eb0e98be
diff --git a/net-fs/samba/samba-4.2.14.ebuild b/net-fs/samba/samba-4.2.14.ebuild
index 8fa65156a539..5a6e0f9fd13d 100644
--- a/net-fs/samba/samba-4.2.14.ebuild
+++ b/net-fs/samba/samba-4.2.14.ebuild
@@ -48,6 +48,7 @@ CDEPEND="${PYTHON_DEPS}
 	sys-libs/readline:=
 	virtual/libiconv
 	dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	net-libs/libnsl:=[${MULTILIB_USEDEP}]
 	>=net-libs/socket_wrapper-1.1.2[${MULTILIB_USEDEP}]
 	sys-apps/attr[${MULTILIB_USEDEP}]
 	sys-libs/libcap
@@ -63,7 +64,10 @@ CDEPEND="${PYTHON_DEPS}
 	acl? ( virtual/acl )
 	addns? ( net-dns/bind-tools[gssapi] )
 	aio? ( dev-libs/libaio )
-	cluster? ( !dev-db/ctdb )
+	cluster? (
+		net-libs/rpcsvc-proto
+		!dev-db/ctdb
+	)
 	cups? ( net-print/cups )
 	dmapi? ( sys-apps/dmapi )
 	fam? ( virtual/fam )
diff --git a/net-fs/samba/samba-4.5.16.ebuild b/net-fs/samba/samba-4.5.16.ebuild
index da3ffbe0deda..7c80d9db44e7 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 ~hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86"
 
 DESCRIPTION="Samba Suite Version 4"
 HOMEPAGE="http://www.samba.org/"
@@ -53,6 +53,7 @@ CDEPEND="${PYTHON_DEPS}
 	dev-libs/iniparser:0
 	dev-libs/popt[${MULTILIB_USEDEP}]
 	dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	net-libs/libnsl:=[${MULTILIB_USEDEP}]
 	sys-apps/attr[${MULTILIB_USEDEP}]
 	>=sys-libs/ldb-1.1.27[ldap(+)?,python(+),${MULTILIB_USEDEP}]
 	<sys-libs/ldb-1.1.30[ldap(+)?,python(+),${MULTILIB_USEDEP}]
@@ -67,7 +68,10 @@ CDEPEND="${PYTHON_DEPS}
 	pam? ( virtual/pam )
 	acl? ( virtual/acl )
 	addns? ( net-dns/bind-tools[gssapi] )
-	cluster? ( !dev-db/ctdb )
+	cluster? (
+		net-libs/rpcsvc-proto
+		!dev-db/ctdb
+	)
 	cups? ( net-print/cups )
 	dmapi? ( sys-apps/dmapi )
 	fam? ( virtual/fam )
diff --git a/net-fs/samba/samba-4.6.14.ebuild b/net-fs/samba/samba-4.6.14.ebuild
index ac34ac0c5aa6..5cb08f5d799b 100644
--- a/net-fs/samba/samba-4.6.14.ebuild
+++ b/net-fs/samba/samba-4.6.14.ebuild
@@ -48,6 +48,7 @@ CDEPEND="
 	dev-libs/popt[${MULTILIB_USEDEP}]
 	dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}]
 	>=dev-util/cmocka-1.0.0[${MULTILIB_USEDEP}]
+	net-libs/libnsl:=[${MULTILIB_USEDEP}]
 	sys-apps/attr[${MULTILIB_USEDEP}]
 	~sys-libs/ldb-1.1.29[ldap(+)?,python(+),${PYTHON_USEDEP},${MULTILIB_USEDEP}]
 	sys-libs/libcap
@@ -65,7 +66,10 @@ CDEPEND="
 		dev-python/dnspython:=[${PYTHON_USEDEP}]
 	)
 	ceph? ( sys-cluster/ceph )
-	cluster? ( !dev-db/ctdb )
+	cluster? (
+		net-libs/rpcsvc-proto
+		!dev-db/ctdb
+	)
 	cups? ( net-print/cups )
 	debug? ( dev-util/lttng-ust )
 	dmapi? ( sys-apps/dmapi )
diff --git a/net-fs/samba/samba-4.6.15.ebuild b/net-fs/samba/samba-4.6.15.ebuild
index ac34ac0c5aa6..5cb08f5d799b 100644
--- a/net-fs/samba/samba-4.6.15.ebuild
+++ b/net-fs/samba/samba-4.6.15.ebuild
@@ -48,6 +48,7 @@ CDEPEND="
 	dev-libs/popt[${MULTILIB_USEDEP}]
 	dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}]
 	>=dev-util/cmocka-1.0.0[${MULTILIB_USEDEP}]
+	net-libs/libnsl:=[${MULTILIB_USEDEP}]
 	sys-apps/attr[${MULTILIB_USEDEP}]
 	~sys-libs/ldb-1.1.29[ldap(+)?,python(+),${PYTHON_USEDEP},${MULTILIB_USEDEP}]
 	sys-libs/libcap
@@ -65,7 +66,10 @@ CDEPEND="
 		dev-python/dnspython:=[${PYTHON_USEDEP}]
 	)
 	ceph? ( sys-cluster/ceph )
-	cluster? ( !dev-db/ctdb )
+	cluster? (
+		net-libs/rpcsvc-proto
+		!dev-db/ctdb
+	)
 	cups? ( net-print/cups )
 	debug? ( dev-util/lttng-ust )
 	dmapi? ( sys-apps/dmapi )
diff --git a/net-fs/samba/samba-4.7.6.ebuild b/net-fs/samba/samba-4.7.6.ebuild
index 5b1399ed756f..6a4a386e8bae 100644
--- a/net-fs/samba/samba-4.7.6.ebuild
+++ b/net-fs/samba/samba-4.7.6.ebuild
@@ -47,6 +47,7 @@ CDEPEND="
 	dev-libs/popt[${MULTILIB_USEDEP}]
 	dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}]
 	>=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
+	net-libs/libnsl:=[${MULTILIB_USEDEP}]
 	sys-apps/attr[${MULTILIB_USEDEP}]
 	>=sys-libs/ldb-1.2.3[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
 	sys-libs/libcap
@@ -64,7 +65,10 @@ CDEPEND="
 		dev-python/dnspython:=[${PYTHON_USEDEP}]
 	)
 	ceph? ( sys-cluster/ceph )
-	cluster? ( !dev-db/ctdb )
+	cluster? (
+		net-libs/rpcsvc-proto
+		!dev-db/ctdb
+	)
 	cups? ( net-print/cups )
 	debug? ( dev-util/lttng-ust )
 	dmapi? ( sys-apps/dmapi )
@@ -78,10 +82,6 @@ CDEPEND="
 	system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
 	system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] )
 	systemd? ( sys-apps/systemd:0= )
-	|| (
-		net-libs/libnsl
-		<sys-libs/glibc-2.26[rpc(+)]
-	)
 "
 DEPEND="${CDEPEND}
 	${PYTHON_DEPS}
diff --git a/net-fs/samba/samba-4.7.7.ebuild b/net-fs/samba/samba-4.7.7.ebuild
index 5b1399ed756f..6a4a386e8bae 100644
--- a/net-fs/samba/samba-4.7.7.ebuild
+++ b/net-fs/samba/samba-4.7.7.ebuild
@@ -47,6 +47,7 @@ CDEPEND="
 	dev-libs/popt[${MULTILIB_USEDEP}]
 	dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}]
 	>=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
+	net-libs/libnsl:=[${MULTILIB_USEDEP}]
 	sys-apps/attr[${MULTILIB_USEDEP}]
 	>=sys-libs/ldb-1.2.3[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
 	sys-libs/libcap
@@ -64,7 +65,10 @@ CDEPEND="
 		dev-python/dnspython:=[${PYTHON_USEDEP}]
 	)
 	ceph? ( sys-cluster/ceph )
-	cluster? ( !dev-db/ctdb )
+	cluster? (
+		net-libs/rpcsvc-proto
+		!dev-db/ctdb
+	)
 	cups? ( net-print/cups )
 	debug? ( dev-util/lttng-ust )
 	dmapi? ( sys-apps/dmapi )
@@ -78,10 +82,6 @@ CDEPEND="
 	system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
 	system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] )
 	systemd? ( sys-apps/systemd:0= )
-	|| (
-		net-libs/libnsl
-		<sys-libs/glibc-2.26[rpc(+)]
-	)
 "
 DEPEND="${CDEPEND}
 	${PYTHON_DEPS}
diff --git a/net-fs/samba/samba-4.8.0.ebuild b/net-fs/samba/samba-4.8.0.ebuild
index 7a9862d6d28e..b21453151bb4 100644
--- a/net-fs/samba/samba-4.8.0.ebuild
+++ b/net-fs/samba/samba-4.8.0.ebuild
@@ -47,6 +47,7 @@ CDEPEND="
 	dev-libs/popt[${MULTILIB_USEDEP}]
 	dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}]
 	>=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
+	net-libs/libnsl:=[${MULTILIB_USEDEP}]
 	sys-apps/attr[${MULTILIB_USEDEP}]
 	>=sys-libs/ldb-1.3.2[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
 	sys-libs/libcap
@@ -64,7 +65,10 @@ CDEPEND="
 		dev-python/dnspython:=[${PYTHON_USEDEP}]
 	)
 	ceph? ( sys-cluster/ceph )
-	cluster? ( !dev-db/ctdb )
+	cluster? (
+		net-libs/rpcsvc-proto
+		!dev-db/ctdb
+	)
 	cups? ( net-print/cups )
 	debug? ( dev-util/lttng-ust )
 	dmapi? ( sys-apps/dmapi )
@@ -78,10 +82,6 @@ CDEPEND="
 	system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
 	system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] )
 	systemd? ( sys-apps/systemd:0= )
-	|| (
-		net-libs/libnsl
-		<sys-libs/glibc-2.26[rpc(+)]
-	)
 "
 DEPEND="${CDEPEND}
 	${PYTHON_DEPS}
diff --git a/net-fs/samba/samba-4.8.1.ebuild b/net-fs/samba/samba-4.8.1.ebuild
index 1dfa9f27ec73..30c1346e24f0 100644
--- a/net-fs/samba/samba-4.8.1.ebuild
+++ b/net-fs/samba/samba-4.8.1.ebuild
@@ -47,6 +47,7 @@ CDEPEND="
 	dev-libs/popt[${MULTILIB_USEDEP}]
 	dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}]
 	>=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
+	net-libs/libnsl:=[${MULTILIB_USEDEP}]
 	sys-apps/attr[${MULTILIB_USEDEP}]
 	>=sys-libs/ldb-1.3.2[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
 	sys-libs/libcap
@@ -64,7 +65,10 @@ CDEPEND="
 		dev-python/dnspython:=[${PYTHON_USEDEP}]
 	)
 	ceph? ( sys-cluster/ceph )
-	cluster? ( !dev-db/ctdb )
+	cluster? (
+		net-libs/rpcsvc-proto
+		!dev-db/ctdb
+	)
 	cups? ( net-print/cups )
 	debug? ( dev-util/lttng-ust )
 	dmapi? ( sys-apps/dmapi )
@@ -78,10 +82,6 @@ CDEPEND="
 	system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
 	system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] )
 	systemd? ( sys-apps/systemd:0= )
-	|| (
-		net-libs/libnsl
-		<sys-libs/glibc-2.26[rpc(+)]
-	)
 "
 DEPEND="${CDEPEND}
 	${PYTHON_DEPS}