gentoo resync : 03.03.2021

14 files changed, 289 insertions, 34 deletions

diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index 19915def1428..73ed336239d5 100644
--- a/net-fs/Manifest.gz
+++ b/net-fs/Manifest.gz
diff --git a/net-fs/autofs/Manifest b/net-fs/autofs/Manifest
index b576d907657c..dec1c0ff20d2 100644
--- a/net-fs/autofs/Manifest
+++ b/net-fs/autofs/Manifest
@@ -7,4 +7,4 @@ DIST autofs-5.1.6.tar.xz 315316 BLAKE2B 0c5e2351462505c6de0b12e510f0c08a625a0235
 DIST autofs-5.1.7.tar.xz 327752 BLAKE2B bff290048fb2849dd4c7099718f6824eac7e4f700909342f82b79a3baa752c4efe7f45be3492578fa15df6d959751be5d7fae5aafe129b52425c0d9ab19eaccc SHA512 cf994d0e68d5f6a5647235000743811a791150ece0a90ed9e1cb9bb131259f52769371c6a06d968b7191b10e709c9c90de611cc3ee310fbbea87f60034b3d4e1
 EBUILD autofs-5.1.6-r1.ebuild 3071 BLAKE2B 5c64c0658a1241bd58699cac218c5b7812e211b385377fd33055d1599abf2062f5fa74fa4b9baa1e7c94d61aaa0b2115c1e328b885c4a1761b5c1d1835ac3d71 SHA512 e08b9bbf3cf13f170ddf32fde3029a68d02a8843c7a392f448cf543ed5936d017e3e3473673f35c37259909c479f81f6d39e45e52458e78a8f35cb412c50c2c6
 EBUILD autofs-5.1.7.ebuild 3084 BLAKE2B 13858264dacc7da28d78c3aa037254b19ad7fa949d514b636283378a25f8eff68ae3408de0c72b35f2c176f02ee81e626ccf221c53d7c0066b491efd7d7dfeb1 SHA512 d446d1cbb0a5e5ffcd3e87092b8a4fff0eb733fa2cc964ed0f1f2d277eda79a8df87e04543c2b86c4aa4243f2e6b1045c381c006322ab0dce755243e145dbc5e
-MISC metadata.xml 976 BLAKE2B 4aa6e19a7966c42af8daca6be175f33769d75b6342a114d42b47e374f6b8df3ec0cc5c25d1c7a295f3d11f54555e4a2b1dc654aa335a89ee79bdb47fb796eaf1 SHA512 23aff908ddf72ab528f025b750bc48af90864c39c7ffb44537b87992d7b5d802d46f355ee7af38d57514a66894596a91a027b2db13940106d3a74ffa53d6758d
+MISC metadata.xml 869 BLAKE2B a111ebef7acf2c20483b6fc26c50b7c388728a6be2198815467a8e3fd9bc34e1f623cbb62558c9a97a0fcc84db91741e1435e29235a06577c5bcb07a7dab4af5 SHA512 1e6ca7144a39f77cf1e14f0fe05de23c2887b37cc4445696affc938eb340747af33a01981cec7b88ba6bfcac2a7d465e38d78fd39dadf825fd2783c5698a590f
diff --git a/net-fs/autofs/metadata.xml b/net-fs/autofs/metadata.xml
index a22b6ea3dc91..01c04626d2ee 100644
--- a/net-fs/autofs/metadata.xml
+++ b/net-fs/autofs/metadata.xml
@@ -5,10 +5,6 @@
 		<email>dlan@gentoo.org</email>
 		<name>Yixun Lan</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>mattst88@gentoo.org</email>
-		<name>Matt Turner</name>
-	</maintainer>
 	<use>
 		<flag name="dmalloc">Enable debugging with the dmalloc library</flag>
 		<flag name="ldap">Install LDAP module</flag>
diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
index 04f945736b2d..566a2a76a98e 100644
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -14,6 +14,8 @@ AUX rpc.statd.initd 706 BLAKE2B 6c175729706d298307deea1d190703e67edb671a6b2c8621
 AUX rpc.svcgssd.initd 470 BLAKE2B c610a7abc44b86ca242d59f833ffa6e42f48d1c3bf93420988c6c6dfcd5cc4d8e02eaf2f3a86bb8bca7c8952e05017f887e6c4f4290085c41cc095a580e04235 SHA512 819cce4ae0a0f26bc74ce546e149b98420584240a594c9bb4a0a49413750320bde050866f3753c499425ea8d8df094211fb1f7e020ce281791e1933e1bc6a47f
 DIST nfs-utils-2.5.1.tar.bz2 931848 BLAKE2B 84c93ef5707bd97e9e1107dcca0530a3c137cb5ad04c7533bb8aee595a53fdc72359252d009fde95b9833a61f1695db1d6b1726081e5e8efd6c528e831f9834c SHA512 36c11668a9d2a382206db3d73a3d03000cdd2be9836fcbbbd327eb38515ac0b451520f6ffdc69bc05b2b81c60ecb88d50a20a50f123b8092a5b63e1c1054a2eb
 DIST nfs-utils-2.5.2.tar.bz2 933724 BLAKE2B 691204739fa4348cea6234f1b87bd74872c94a0c175b09a08ebb4d5cefb0b04c1adfffadc82b7e9a4a45d5c86e7f2af62b275526d27482798d4c5dc296a5be09 SHA512 9e97cf5cd8be27d58e1dcd7fa563280ac8afa57d09387dddd2d6b03cbcd6dae4066ac29804b8b1624b61cb12f2aa016380c85b731113c9359a0e6887d2db0641
+DIST nfs-utils-2.5.3.tar.bz2 937544 BLAKE2B 817af2c302cf110519e64353a507645137ffd3b93b46eb94e71d45a1869c9e831e344f0baa33b1b39514962798cca542cf56a2830520c67e96e78995f2bf901f SHA512 3be82f42c5da2bbbca4429459c858c58ae7333725749213c824d0c01b78f0beb7384455f314fc1cc1799968f9f40fd616297c7baf3514ca0e31d4686e9d6e732
 EBUILD nfs-utils-2.5.1.ebuild 5788 BLAKE2B 21d2f3f7d02ebd5219cb7f133f55141dfddc3e73973122e5d12d58bae188d6446ffe9c411f011d88aa073398e63360f8f2d60a98cad9d121247d4aaef163e07b SHA512 b681da7cc4f75375361cebfb34a1ead6334715ae637c6162a9085b64eb6f2c7027a5d8e0145fd422b50fb10ca69a233156fe6b7fb7b150edd18933b62ae6107b
 EBUILD nfs-utils-2.5.2.ebuild 5796 BLAKE2B f0f86570e1c75607d76ad3716bb4c6e2fb13b8ab5e719571f7ea6703709ff1c1120b1d8078cfad98594f1cdb166f46e5faec8cccf973d46625c0d3cd8713091c SHA512 92ff15f9816b5f1526564148880f6627b700b1d6a253f263610b7c54ccbf741cd263499cb756c5f379d44ef393c5d304abfba8202470ae379d4a1af85d942a23
+EBUILD nfs-utils-2.5.3.ebuild 5796 BLAKE2B 18f5acaea64cbfecb9892136323c54100d8b33478be5adff8e06b76c787f8c5d8eed55c9058ab49cbaf2e033d35e6e9051754a04509d07c0596b3d4123119037 SHA512 b6a4aa1bd6be7f1cf14209d2939d3444534b73f96d36e7f193822505f171c7df623579c637a79b6e19d99102232fae71b083037b3c0f7f9be4ab420811689acb
 MISC metadata.xml 865 BLAKE2B b0f6be692417a8af07b26e95555c5aba8416ed9d1afa59d15bf9df313b727db2a0331500dc93ae34ee9ed4c693c3505bad2dbc405facdbca5447cf37d92340fc SHA512 df1dd59066480b5e3eb8b46091d134ea1701600c20766b259d60c8a81786f4f06edbe7441a20bb62f10b53d6d8c5d76ae073f392254caa12d3dea3b09c172973
diff --git a/net-fs/nfs-utils/nfs-utils-2.5.3.ebuild b/net-fs/nfs-utils/nfs-utils-2.5.3.ebuild
new file mode 100644
index 000000000000..f536708a51b9
--- /dev/null
+++ b/net-fs/nfs-utils/nfs-utils-2.5.3.ebuild
@@ -0,0 +1,204 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic linux-info multilib systemd
+
+DESCRIPTION="NFS client and server daemons"
+HOMEPAGE="http://linux-nfs.org/"
+
+if [[ "${PV}" = *_rc* ]] ; then
+	MY_PV="$(ver_rs 1- -)"
+	SRC_URI="http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=snapshot;h=refs/tags/${PN}-${MY_PV};sf=tgz -> ${P}.tar.gz"
+	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 ~riscv ~s390 ~sparc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="caps ipv6 junction kerberos ldap +libmount nfsdcld +nfsidmap +nfsv4 nfsv41 selinux tcpd +uuid"
+REQUIRED_USE="kerberos? ( nfsv4 )"
+RESTRICT="test" #315573
+
+# kth-krb doesn't provide the right include
+# files, and nfs-utils doesn't build against heimdal either,
+# so don't depend on virtual/krb.
+# (04 Feb 2005 agriffis)
+DEPEND="
+	>=dev-db/sqlite-3.3
+	dev-libs/libxml2
+	net-libs/libtirpc:=
+	>=net-nds/rpcbind-0.2.4
+	sys-libs/e2fsprogs-libs
+	caps? ( sys-libs/libcap )
+	ldap? ( net-nds/openldap )
+	libmount? ( sys-apps/util-linux )
+	nfsv4? (
+		dev-libs/libevent:=
+		>=sys-apps/keyutils-1.5.9:=
+		kerberos? (
+			>=net-libs/libtirpc-0.2.4-r1[kerberos]
+			app-crypt/mit-krb5
+		)
+	)
+	nfsv41? (
+		sys-fs/lvm2
+	)
+	tcpd? ( sys-apps/tcp-wrappers )
+	uuid? ( sys-apps/util-linux )"
+RDEPEND="${DEPEND}
+	!net-libs/libnfsidmap
+	!net-nds/portmap
+	!<sys-apps/openrc-0.13.9
+	selinux? (
+		sec-policy/selinux-rpc
+		sec-policy/selinux-rpcbind
+	)
+"
+BDEPEND="
+	net-libs/rpcsvc-proto
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.5.2-no-werror.patch
+	"${FILESDIR}"/${PN}-2.4.2-Ensure-consistent-struct-stat.patch
+)
+
+pkg_setup() {
+	linux-info_pkg_setup
+	if use nfsv4 && ! use nfsdcld && linux_config_exists && ! linux_chkconfig_present CRYPTO_MD5 ; then
+		ewarn "Your NFS server will be unable to track clients across server restarts!"
+		ewarn "Please enable the \"${HILITE}nfsdcld${NORMAL}\" USE flag to install the nfsdcltrack usermode"
+		ewarn "helper upcall program, or enable ${HILITE}CONFIG_CRYPTO_MD5${NORMAL} in your kernel to"
+		ewarn "support the legacy, in-kernel client tracker."
+	fi
+}
+
+src_prepare() {
+	default
+
+	sed \
+		-e "/^sbindir/s:= := \"${EPREFIX}\":g" \
+		-i utils/*/Makefile.am || die
+
+	eautoreconf
+}
+
+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
+		--enable-tirpc
+		--with-tirpcinclude="${EPREFIX}"/usr/include/tirpc/
+		--with-pluginpath="${EPREFIX}"/usr/$(get_libdir)/libnfsidmap
+		--with-rpcgen
+		--with-systemd="$(systemd_get_systemunitdir)"
+		--without-gssglue
+		$(use_enable caps)
+		$(use_enable ipv6)
+		$(use_enable junction)
+		$(use_enable kerberos gss)
+		$(use_enable kerberos svcgss)
+		$(use_enable ldap)
+		$(use_enable libmount libmount-mount)
+		$(use_enable nfsdcld nfsdcltrack)
+		$(use_enable nfsv4)
+		$(use_enable nfsv41)
+		$(use_enable uuid)
+		$(use_with tcpd tcp-wrappers)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	# remove compiled files bundled in the tarball
+	emake clean
+	default
+}
+
+src_install() {
+	default
+	rm linux-nfs/Makefile* || die
+	dodoc -r linux-nfs README
+
+	# Don't overwrite existing xtab/etab, install the original
+	# versions somewhere safe...  more info in pkg_postinst
+	keepdir /var/lib/nfs/{,sm,sm.bak}
+	mv "${ED}"/var/lib/nfs "${ED}"/usr/$(get_libdir)/ || die
+
+	# Install some client-side binaries in /sbin
+	dodir /sbin
+	mv "${ED}"/usr/sbin/rpc.statd "${ED}"/sbin/ || die
+
+	if use nfsv4 && use nfsidmap ; then
+		insinto /etc
+		doins support/nfsidmap/idmapd.conf
+
+		# Install a config file for idmappers in newer kernels. #415625
+		insinto /etc/request-key.d
+		echo 'create id_resolver * * /usr/sbin/nfsidmap -t 600 %k %d' > id_resolver.conf
+		doins id_resolver.conf
+	fi
+
+	insinto /etc
+	doins "${FILESDIR}"/exports
+	keepdir /etc/exports.d
+
+	local f list=() opt_need=""
+	if use nfsv4 ; then
+		opt_need="rpc.idmapd"
+		list+=( rpc.idmapd rpc.pipefs )
+		use kerberos && list+=( rpc.gssd rpc.svcgssd )
+	fi
+	for f in nfs nfsclient rpc.statd "${list[@]}" ; do
+		newinitd "${FILESDIR}"/${f}.initd ${f}
+	done
+	newinitd "${FILESDIR}"/nfsmount.initd-1.3.1 nfsmount # Nuke after 2015/08/01
+	for f in nfs nfsclient ; do
+		newconfd "${FILESDIR}"/${f}.confd ${f}
+	done
+	sed -i \
+		-e "/^NFS_NEEDED_SERVICES=/s:=.*:=\"${opt_need}\":" \
+		"${ED}"/etc/conf.d/nfs || die #234132
+
+	local systemd_systemunitdir="$(systemd_get_systemunitdir)"
+	sed -i \
+		-e 's:/usr/sbin/rpc.statd:/sbin/rpc.statd:' \
+		"${ED}${systemd_systemunitdir}"/* || die
+
+	keepdir /var/lib/nfs #368505
+	keepdir /var/lib/nfs/v4recovery #603628
+
+}
+
+pkg_postinst() {
+	# Install default xtab and friends if there's none existing.  In
+	# src_install we put them in /usr/lib/nfs for safe-keeping, but
+	# the daemons actually use the files in /var/lib/nfs.  #30486
+	local f
+	for f in "${EROOT}"/usr/$(get_libdir)/nfs/*; do
+		[[ -e ${EROOT}/var/lib/nfs/${f##*/} ]] && continue
+		einfo "Copying default ${f##*/} from ${EPREFIX}/usr/$(get_libdir)/nfs to ${EPREFIX}/var/lib/nfs"
+		cp -pPR "${f}" "${EROOT}"/var/lib/nfs/
+	done
+
+	if systemd_is_booted; then
+		for v in ${REPLACING_VERSIONS}; do
+			if ver_test "${v}" -lt 1.3.0; then
+				ewarn "We have switched to upstream systemd unit files. Since"
+				ewarn "they got renamed, you should probably enable the new ones."
+				ewarn "You can run 'equery files nfs-utils | grep systemd'"
+				ewarn "to know what services you need to enable now."
+			fi
+		done
+	else
+		ewarn "If you use OpenRC, the nfsmount service has been replaced with nfsclient."
+		ewarn "If you were using nfsmount, please add nfsclient and netmount to the"
+		ewarn "same runlevel as nfsmount."
+	fi
+}
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 75a0f1b92eeb..4fc023b70e83 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -10,10 +10,10 @@ DIST samba-4.12.11.tar.gz 18249361 BLAKE2B 74208769d42f3cb534855c77933b3e820cf1c
 DIST samba-4.12.9.tar.gz 18236198 BLAKE2B e19cbbbb8416626ca2fe769bf26f3645e94f23781538b3c5e1f94ce618efb807d0732e5591525ec066a31cc0211463b9b66105d1d499989012d624edaa2a132c SHA512 8bd3122bcaab2f5a16a73902a9b628384063a8116a08f0254541e05c148016839b3215c60ff0d3291a332e7884708950ad64137204b0ac19801012d3b6684fa6
 DIST samba-4.13.3.tar.gz 18422056 BLAKE2B f2b8528047e47e65ce8e0a089092c5e68ee7555248e163c0ed969ae1bf19919ed55bb614f2adae75e26725bf2079b5be3efba9af3a18ff8cbf5a98e1f39dc1bd SHA512 e7d29a89ba31ac6ca6c2dfd2629b8e07e47f4b1f265907847b43845dcf19a2200bcb1ca9f6845dd39c1ffca5dbf89f998bcc4defe33f5e3c4d8006ec9c6e88ab
 DIST samba-4.13.4.tar.gz 18429050 BLAKE2B b2141f5b39e849dce4607430fdde217535c6d9aa236807de2e8072415c0e408b2690ea7b335915d87f9a4b574615f282c6724886210d62ad1a059eed447a3e34 SHA512 fb7b0e2ad122a72ef534de6446e5a44b842553963fc331c68454e8ff761f16e921a0dcdd653fe6b5e90d4ccf28869bd13df53d615d86cccd85a5ec3589268cf6
-DIST samba-4.14.0rc2.tar.gz 18636536 BLAKE2B 131b942f453d6ec0f45095cc5aa064f59403fb1ab204c6eeaf439574dd6074dd1f17c28d5c8ce865a1d8a9143278302b4320fbcc41e6afbf4bc7515ec720b5d7 SHA512 a319ae3095b13fa4a7ff911a5c12dbbe9058e123746eaedcc299314132ea243d01e827877e31aaf2776302d52aca9294b7ac7c4e32f4c40c0f2c92386e7b58c5
-EBUILD samba-4.12.11.ebuild 9441 BLAKE2B 28b8db9531deed0fd7c94375fea64113a84564aca3c65a2608861b8b288847f99ec6dfcffb69abc0445a2f056cbb4efed3851b4eb1414b0b08f228a7b58cb073 SHA512 427d149408968ed04c220761ca21bd90fa3346e55dc030a45a56bbecd414fb9e48077b39c4e256fa547f86f3e4329d784e601ebac3f31d6ab3f141b8acc08331
-EBUILD samba-4.12.9-r1.ebuild 9480 BLAKE2B 70fe8a11fe9cbed847db6d15184ff86708e823c64895331b602414b382213be32351ee1363f6d5a1149997619da23a099232be45ca88ced4254fcd6273e60a4c SHA512 b1570f044878b0a6a4bd6894a85fc89477f1f2851074079c7f8646a988188580461c4b5d46f2d5b0e09f3da6191bd59ec13d15c343585f1be5161bcd29661502
-EBUILD samba-4.13.3-r1.ebuild 9541 BLAKE2B 6147960f56699be99991f96bb6c9f6003a2c2680f9f62e30edf4b8f6a9b13e641946a4552dd63d90d78dc903268502f6d2df16122f634891184f00faef4ee7dc SHA512 942d6ab71ecb8e7c178bcb17d725eda991d7841f876bece1a6f2e26563ef1426046f6310746bfdb856bcec731647f895ee7754994db9ea6cc8c238a6622c89a3
-EBUILD samba-4.13.4.ebuild 9541 BLAKE2B 6147960f56699be99991f96bb6c9f6003a2c2680f9f62e30edf4b8f6a9b13e641946a4552dd63d90d78dc903268502f6d2df16122f634891184f00faef4ee7dc SHA512 942d6ab71ecb8e7c178bcb17d725eda991d7841f876bece1a6f2e26563ef1426046f6310746bfdb856bcec731647f895ee7754994db9ea6cc8c238a6622c89a3
-EBUILD samba-4.14.0_rc2.ebuild 9541 BLAKE2B 0e3a8919bd197f2513f0d46ed440739140cbea7a3e79fed29e4f0aa411009b553819cce891a673d02df11c8eed389eb6673b27d334fc85eeafef305604565db3 SHA512 e521aa3676c30fdda52c06f98787655182afb7109429fd6a1f7dc78b02d41b5c1c69b449c8686cbf1e3ca6a045c755715dbe05df6f8fd05f2e97dc91a0c4ad60
-MISC metadata.xml 1848 BLAKE2B 2ae9d28a0ea8d1b53f4999e23044713b42f0fc829dd2df20c301acefe9d2c9334c97121ed85c50a5d0734cec834652b1f8ec8d0bd5cca30afbecc4730cb4d1a8 SHA512 48ac3deb48a2188836be87c485f1ba988788814aa1b495e89d70eb17f67fa80163132ac788d3bc0d586ba1957b22e4094036186c40af0cfc48aa453490021ec5
+DIST samba-4.14.0rc4.tar.gz 18635886 BLAKE2B 70f6f7f8e34ea5e0eb07c7532c4e3be854bf867fc4e7a2f2bd9cea3b9d81cad15e89d7410722560d5d8c3e49e8dfb0aedeb8c73d7d68acd958d51172658c21f2 SHA512 cbe182b0bc849e5477aafa07afb5c7a365239e612bbc53dfabadcb09b7157a2c6b6cc7de9030cec6d026cc03a2864a044749bf186acab421f26e5525e67d783b
+EBUILD samba-4.12.11.ebuild 9732 BLAKE2B 8a98c1b956bbc4e236458328b2517f4ee99ab449a0b6d65e02fd9b10d14afea32ad4b131b081407e7d9fb46e1b68faa44677eb227081e2e7f7b25b4234721a40 SHA512 80017ff4c4867f24634ac537d5f87703b00c7b35b0c3c0c61f10776a652e9303c2c1e186a64b39cce45f9016d380e2a1424fc2ffef1a7a8ece44f5771eb8ca64
+EBUILD samba-4.12.9-r1.ebuild 9771 BLAKE2B 2a3362d9753a1164e1d72d83bce5b729d4ff832dae1e15a9066fc296d1e268efc1dc6c01e4edd278ae0caa3c2137b145a4aed55d8bae34f9740be9e70fbb45f4 SHA512 f7c94d5ed0271c0585c278e3195130b57ffc0feae99e67d161a1fcec41e6226968708ae4d20f0b272221a225c1eab8752e11d3fe1933d910cdd375a7b170d1a2
+EBUILD samba-4.13.3-r1.ebuild 9819 BLAKE2B be43da7fb32e2c86dc43ec59624deedd0f4dba15f4c3839ff7541aa0617b885a0fba6c2cd297e13ea76321eb06ddc02a36b530d9beccc94eb8b04905f4a90539 SHA512 94c327ee3e07a4fad4378d88f0d04c6705f52d0a87c114e8433b4a90a13d52d20f0d5faa5de8a19a722f5d9ef1f885c3a6bf31d9a721c3a0494a7baeb657a6b4
+EBUILD samba-4.13.4.ebuild 9819 BLAKE2B be43da7fb32e2c86dc43ec59624deedd0f4dba15f4c3839ff7541aa0617b885a0fba6c2cd297e13ea76321eb06ddc02a36b530d9beccc94eb8b04905f4a90539 SHA512 94c327ee3e07a4fad4378d88f0d04c6705f52d0a87c114e8433b4a90a13d52d20f0d5faa5de8a19a722f5d9ef1f885c3a6bf31d9a721c3a0494a7baeb657a6b4
+EBUILD samba-4.14.0_rc4.ebuild 9819 BLAKE2B 4fb7f13b41d7a2266c26b20b0260fe82c86eff2365e2584b20e02f44609b6d957f6cd07e9d9ceb604ffac6b4c01611ce2ad896c9fe35076caf577f6d28180bc0 SHA512 37f00c249d403870248970631b529fa1accfcf9692f155169bc9d4190a471005c00da87b5779f2229ce46536b7857e9521f561e8159e24cf7f1d2f87fed57b70
+MISC metadata.xml 2165 BLAKE2B 5fa428c3ddb3f45073923778fc80ca4d62090232b9bb6bcfdd0a16a6c4c51304794db41359c17b6ba9492b30dba0f42ff7ada6c8a30c5df80e83e748d8009ee9 SHA512 8723f3a16210e8da11eb1d3ea8142bff3deeaecc44c62da68a789b5364bf3456aef65794b205d24cc41eff7ba03fffd38266aea2dd1883eff5c9ca305d2032ed
diff --git a/net-fs/samba/metadata.xml b/net-fs/samba/metadata.xml
index d1bb8bfdd510..e871aa5724b6 100644
--- a/net-fs/samba/metadata.xml
+++ b/net-fs/samba/metadata.xml
@@ -16,12 +16,16 @@
 		<flag name="client">Enables the client part</flag>
 		<flag name="cluster">Enable support for clustering</flag>
 		<flag name="dmapi">Enable support for DMAPI. This currently works only in combination with XFS.</flag>
+		<flag name="glusterfs">Enable support for Glusterfs filesystem via <pkg>sys-cluster/glusterfs</pkg></flag>
 		<flag name="gpg">Use <pkg>app-crypt/gpgme</pkg> for AD DC</flag>
 		<flag name="json">Enable json audit support through <pkg>dev-libs/jansson</pkg></flag>
 		<flag name="iprint">Enabling iPrint technology by Novell</flag>
+		<flag name="ntvfs">Enable support for NTVFS fileserver</flag>
 		<flag name="profiling-data">Enables support for collecting profiling data</flag>
 		<flag name="quota">Enables support for user quotas</flag>
+		<flag name="regedit">Enable support for regedit command-line tool</flag>
 		<flag name="snapper">Enable vfs_snapper module (requires <pkg>sys-apps/dbus</pkg>)</flag>
+		<flag name="spotlight">Enable support for spotlight backend</flag>
 		<flag name="system-heimdal">Use <pkg>app-crypt/heimdal</pkg> instead of
 			bundled heimdal.</flag>
 		<flag name="system-mitkrb5">Use <pkg>app-crypt/mit-krb5</pkg> instead of
diff --git a/net-fs/samba/samba-4.12.11.ebuild b/net-fs/samba/samba-4.12.11.ebuild
index 4945e097198f..4c218a5d0893 100644
--- a/net-fs/samba/samba-4.12.11.ebuild
+++ b/net-fs/samba/samba-4.12.11.ebuild
@@ -23,9 +23,10 @@ LICENSE="GPL-3"
 
 SLOT="0"
 
-IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam gpg iprint
-json ldap pam profiling-data python quota selinux snapper syslog
-system-heimdal +system-mitkrb5 systemd test winbind zeroconf"
+IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam glusterfs
+gpg iprint json ldap ntvfs pam profiling-data python quota +regedit selinux
+snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test winbind
+zeroconf"
 
 MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/samba-4.0/policy.h
@@ -89,8 +90,6 @@ CDEPEND="
 "
 DEPEND="${CDEPEND}
 	${PYTHON_DEPS}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
 	>=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}]
 	net-libs/libtirpc[${MULTILIB_USEDEP}]
 	virtual/pkgconfig
@@ -98,6 +97,7 @@ DEPEND="${CDEPEND}
 		net-libs/rpcsvc-proto
 		<sys-libs/glibc-2.26[rpc(+)]
 	)
+	spotlight? ( dev-libs/glib )
 	test? (
 		!system-mitkrb5? (
 			>=sys-libs/nss_wrapper-1.1.3
@@ -112,12 +112,19 @@ RDEPEND="${CDEPEND}
 	selinux? ( sec-policy/selinux-samba )
 "
 
+BDEPEND="
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+"
+
 REQUIRED_USE="
 	addc? ( python json winbind )
 	addns? ( python )
 	ads? ( acl ldap winbind )
 	cluster? ( ads )
 	gpg? ( addc )
+	ntvfs? ( addc )
+	spotlight? ( json )
 	test? ( python )
 	?? ( system-heimdal system-mitkrb5 )
 	${PYTHON_REQUIRED_USE}
@@ -208,13 +215,17 @@ multilib_src_configure() {
 		$(multilib_native_use_enable cups)
 		$(multilib_native_use_with dmapi)
 		$(multilib_native_use_with fam)
+		$(multilib_native_use_enable glusterfs)
 		$(multilib_native_use_with gpg gpgme)
 		$(multilib_native_use_with json)
 		$(multilib_native_use_enable iprint)
+		$(multilib_native_use_with ntvfs ntvfs-fileserver)
 		$(multilib_native_use_with pam)
 		$(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
 		$(multilib_native_use_with quota quotas)
+		$(multilib_native_use_with regedit)
 		$(multilib_native_use_enable snapper)
+		$(multilib_native_use_enable spotlight)
 		$(multilib_native_use_with syslog)
 		$(multilib_native_use_with systemd)
 		--systemd-install-services
diff --git a/net-fs/samba/samba-4.12.9-r1.ebuild b/net-fs/samba/samba-4.12.9-r1.ebuild
index c63729651021..84df21f0f498 100644
--- a/net-fs/samba/samba-4.12.9-r1.ebuild
+++ b/net-fs/samba/samba-4.12.9-r1.ebuild
@@ -23,9 +23,10 @@ LICENSE="GPL-3"
 
 SLOT="0"
 
-IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam gpg iprint
-json ldap pam profiling-data python quota selinux snapper syslog
-system-heimdal +system-mitkrb5 systemd test winbind zeroconf"
+IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam glusterfs
+gpg iprint json ldap ntvfs pam profiling-data python quota +regedit selinux
+snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test winbind
+zeroconf"
 
 MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/samba-4.0/policy.h
@@ -89,8 +90,6 @@ CDEPEND="
 "
 DEPEND="${CDEPEND}
 	${PYTHON_DEPS}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
 	>=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}]
 	net-libs/libtirpc[${MULTILIB_USEDEP}]
 	virtual/pkgconfig
@@ -98,6 +97,7 @@ DEPEND="${CDEPEND}
 		net-libs/rpcsvc-proto
 		<sys-libs/glibc-2.26[rpc(+)]
 	)
+	spotlight? ( dev-libs/glib )
 	test? (
 		!system-mitkrb5? (
 			>=sys-libs/nss_wrapper-1.1.3
@@ -112,12 +112,19 @@ RDEPEND="${CDEPEND}
 	selinux? ( sec-policy/selinux-samba )
 "
 
+BDEPEND="
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+"
+
 REQUIRED_USE="
 	addc? ( python json winbind )
 	addns? ( python )
 	ads? ( acl ldap winbind )
 	cluster? ( ads )
 	gpg? ( addc )
+	ntvfs? ( addc )
+	spotlight? ( json )
 	test? ( python )
 	?? ( system-heimdal system-mitkrb5 )
 	${PYTHON_REQUIRED_USE}
@@ -209,13 +216,17 @@ multilib_src_configure() {
 		$(multilib_native_use_enable cups)
 		$(multilib_native_use_with dmapi)
 		$(multilib_native_use_with fam)
+		$(multilib_native_use_enable glusterfs)
 		$(multilib_native_use_with gpg gpgme)
 		$(multilib_native_use_with json)
 		$(multilib_native_use_enable iprint)
+		$(multilib_native_use_with ntvfs ntvfs-fileserver)
 		$(multilib_native_use_with pam)
 		$(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
 		$(multilib_native_use_with quota quotas)
+		$(multilib_native_use_with regedit)
 		$(multilib_native_use_enable snapper)
+		$(multilib_native_use_enable spotlight)
 		$(multilib_native_use_with syslog)
 		$(multilib_native_use_with systemd)
 		--systemd-install-services
diff --git a/net-fs/samba/samba-4.13.3-r1.ebuild b/net-fs/samba/samba-4.13.3-r1.ebuild
index f5512a97a1a3..315792bf5681 100644
--- a/net-fs/samba/samba-4.13.3-r1.ebuild
+++ b/net-fs/samba/samba-4.13.3-r1.ebuild
@@ -22,9 +22,10 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam gpg iprint
-json ldap pam profiling-data python quota selinux snapper syslog
-system-heimdal +system-mitkrb5 systemd test winbind zeroconf"
+IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam glusterfs
+gpg iprint json ldap ntvfs pam profiling-data python quota +regedit selinux
+snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test winbind
+zeroconf"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	addc? ( python json winbind )
@@ -32,6 +33,8 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	ads? ( acl ldap winbind )
 	cluster? ( ads )
 	gpg? ( addc )
+	ntvfs? ( addc )
+	spotlight? ( json )
 	test? ( python )
 	!ads? ( !addc )
 	?? ( system-heimdal system-mitkrb5 )
@@ -113,6 +116,7 @@ DEPEND="${COMMON_DEPEND}
 		net-libs/rpcsvc-proto
 		<sys-libs/glibc-2.26[rpc(+)]
 	)
+	spotlight? ( dev-libs/glib )
 	test? (
 		!system-mitkrb5? (
 			>=net-dns/resolv_wrapper-1.1.4
@@ -209,12 +213,16 @@ multilib_src_configure() {
 		$(multilib_native_use_enable cups)
 		$(multilib_native_use_with dmapi)
 		$(multilib_native_use_with fam)
+		$(multilib_native_use_enable glusterfs)
 		$(multilib_native_use_with gpg gpgme)
 		$(multilib_native_use_with json)
 		$(multilib_native_use_enable iprint)
+		$(multilib_native_use_with ntvfs ntvfs-fileserver)
 		$(multilib_native_use_with pam)
 		$(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
 		$(multilib_native_use_with quota quotas)
+		$(multilib_native_use_with regedit)
+		$(multilib_native_use_enable spotlight)
 		$(multilib_native_use_with syslog)
 		$(multilib_native_use_with systemd)
 		--systemd-install-services
diff --git a/net-fs/samba/samba-4.13.4.ebuild b/net-fs/samba/samba-4.13.4.ebuild
index f5512a97a1a3..315792bf5681 100644
--- a/net-fs/samba/samba-4.13.4.ebuild
+++ b/net-fs/samba/samba-4.13.4.ebuild
@@ -22,9 +22,10 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam gpg iprint
-json ldap pam profiling-data python quota selinux snapper syslog
-system-heimdal +system-mitkrb5 systemd test winbind zeroconf"
+IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam glusterfs
+gpg iprint json ldap ntvfs pam profiling-data python quota +regedit selinux
+snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test winbind
+zeroconf"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	addc? ( python json winbind )
@@ -32,6 +33,8 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	ads? ( acl ldap winbind )
 	cluster? ( ads )
 	gpg? ( addc )
+	ntvfs? ( addc )
+	spotlight? ( json )
 	test? ( python )
 	!ads? ( !addc )
 	?? ( system-heimdal system-mitkrb5 )
@@ -113,6 +116,7 @@ DEPEND="${COMMON_DEPEND}
 		net-libs/rpcsvc-proto
 		<sys-libs/glibc-2.26[rpc(+)]
 	)
+	spotlight? ( dev-libs/glib )
 	test? (
 		!system-mitkrb5? (
 			>=net-dns/resolv_wrapper-1.1.4
@@ -209,12 +213,16 @@ multilib_src_configure() {
 		$(multilib_native_use_enable cups)
 		$(multilib_native_use_with dmapi)
 		$(multilib_native_use_with fam)
+		$(multilib_native_use_enable glusterfs)
 		$(multilib_native_use_with gpg gpgme)
 		$(multilib_native_use_with json)
 		$(multilib_native_use_enable iprint)
+		$(multilib_native_use_with ntvfs ntvfs-fileserver)
 		$(multilib_native_use_with pam)
 		$(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
 		$(multilib_native_use_with quota quotas)
+		$(multilib_native_use_with regedit)
+		$(multilib_native_use_enable spotlight)
 		$(multilib_native_use_with syslog)
 		$(multilib_native_use_with systemd)
 		--systemd-install-services
diff --git a/net-fs/samba/samba-4.14.0_rc2.ebuild b/net-fs/samba/samba-4.14.0_rc4.ebuild
index 08b7f93199df..197b80e67973 100644
--- a/net-fs/samba/samba-4.14.0_rc2.ebuild
+++ b/net-fs/samba/samba-4.14.0_rc4.ebuild
@@ -22,9 +22,10 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam gpg iprint
-json ldap pam profiling-data python quota selinux snapper syslog
-system-heimdal +system-mitkrb5 systemd test winbind zeroconf"
+IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam glusterfs
+gpg iprint json ldap ntvfs pam profiling-data python quota +regedit selinux
+snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test winbind
+zeroconf"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	addc? ( python json winbind )
@@ -32,6 +33,8 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	ads? ( acl ldap winbind )
 	cluster? ( ads )
 	gpg? ( addc )
+	ntvfs? ( addc )
+	spotlight? ( json )
 	test? ( python )
 	!ads? ( !addc )
 	?? ( system-heimdal system-mitkrb5 )
@@ -113,6 +116,7 @@ DEPEND="${COMMON_DEPEND}
 		net-libs/rpcsvc-proto
 		<sys-libs/glibc-2.26[rpc(+)]
 	)
+	spotlight? ( dev-libs/glib )
 	test? (
 		!system-mitkrb5? (
 			>=net-dns/resolv_wrapper-1.1.4
@@ -209,12 +213,16 @@ multilib_src_configure() {
 		$(multilib_native_use_enable cups)
 		$(multilib_native_use_with dmapi)
 		$(multilib_native_use_with fam)
+		$(multilib_native_use_enable glusterfs)
 		$(multilib_native_use_with gpg gpgme)
 		$(multilib_native_use_with json)
 		$(multilib_native_use_enable iprint)
+		$(multilib_native_use_with ntvfs ntvfs-fileserver)
 		$(multilib_native_use_with pam)
 		$(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
 		$(multilib_native_use_with quota quotas)
+		$(multilib_native_use_with regedit)
+		$(multilib_native_use_enable spotlight)
 		$(multilib_native_use_with syslog)
 		$(multilib_native_use_with systemd)
 		--systemd-install-services
diff --git a/net-fs/smbtad/Manifest b/net-fs/smbtad/Manifest
index abf853596883..e967e7d1ba93 100644
--- a/net-fs/smbtad/Manifest
+++ b/net-fs/smbtad/Manifest
@@ -1,4 +1,4 @@
 AUX smbtad.rc 493 BLAKE2B 9281ca9b3845edab48fe6d66ea54a1af2f40ee21887b888f83b48297916b91bde215bb8e1698c4799bbda71c01eac27c6fe521a7143a1a9e1bfcf2456c0b06e1 SHA512 8b5d8d717740692baf7f713b2e1d71d87bd0ef906269daf9c9ae78b010470b56495d8b3e756b95ad00055ef9cd6747fe9439750658de13e12e0c344038caf35f
 DIST smbtad-1.2.6.tar.bz2 82062 BLAKE2B fced362e6add2104fbd4815ee570bb0c21e0b47431cf8ba46d07f7ca73ad65ddb4b8762a1ff5d8e7f44fd39cad8409cb3bf6c2b85b9abdfbe6035c2963ef7f52 SHA512 fd3b370d973a42fb2dee48d2fec08e20af32386893ee67bc407decd001a76c944f3a17b3251e9d8d746feb1e87c69776986d600fd108450113835823f6313e2c
-EBUILD smbtad-1.2.6.ebuild 722 BLAKE2B 9e78c78594e946f52b58d8d76bbc4899083f5ac0188afd1ba3126ce193173430b69653a4638e9515cff55aca1b19a301917e25304a6e6640b82752ce40eeb067 SHA512 37e58f9d1fef49f22c907f6877af29c675b20cd9071978214d2e9c716fe415fb7212aa66489206169674b7bf696560a712ede19eab7a92ba604371a8e37c5692
+EBUILD smbtad-1.2.6.ebuild 772 BLAKE2B 42c2f89a91d96c728b2a649a0f3e8c5947bf180a9bb31aa765faee6d3544b01e7170f5133ef067a5ccb52ec007b8a2a01848ecbd09b52f82cfbf3767f9a94259 SHA512 898f489717e4152b6ad0b5d2516208277edcca9cffc16150fb765cd9f29c8f26de8c4c123d520ddec59c74a70b18e9349f2e87a32df17ca0ee4931c53bce1e45
 MISC metadata.xml 332 BLAKE2B d927c06e3831d3b32484a750adc46e1c475f5568fdf7ed299c2e5c8d0cff639a5cf6f5048b7cc859b704fc5cf5b0dce0382c24aefacf94991acc4389aca52583 SHA512 14edfec96bfbb5118d3b7b8e6ec58c7015bcd26f7c2f19b603557bc1849511f73e84cdd0b200bd782279aff282dcd01896abfda253ce71744cc9f859e6e0198e
diff --git a/net-fs/smbtad/smbtad-1.2.6.ebuild b/net-fs/smbtad/smbtad-1.2.6.ebuild
index 8a0ed2811e4b..e1a62c8d8bc1 100644
--- a/net-fs/smbtad/smbtad-1.2.6.ebuild
+++ b/net-fs/smbtad/smbtad-1.2.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit cmake-utils
+inherit cmake-utils flag-o-matic
 
 DESCRIPTION="Data receiver of the SMB Traffic Analyzer project"
 HOMEPAGE="https://github.com/hhetter/smbtad"
@@ -28,6 +28,9 @@ DOCS=( README AUTHORS )
 src_prepare() {
 	cmake-utils_src_prepare
 
+	# bug #707778
+	append-cflags -fcommon
+
 	sed -i \
 		-e '/CMAKE_C_FLAGS/d' \
 		CMakeLists.txt || die