gentoo resync : 08.10.2021

12 files changed, 37 insertions, 5 deletions

diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index b87e11f7ca9a..dbd613e39b62 100644
--- a/net-fs/Manifest.gz
+++ b/net-fs/Manifest.gz
diff --git a/net-fs/davfs2/Manifest b/net-fs/davfs2/Manifest
index 5b3442c648d5..1c88f14a1531 100644
--- a/net-fs/davfs2/Manifest
+++ b/net-fs/davfs2/Manifest
@@ -1,3 +1,4 @@
+AUX davfs2-1.6.0-neon-0.32-support.patch 336 BLAKE2B 6f21c679eb1cdc305e6648be4d3114b9e34adc1eb4cd285ed0731ee7576f20d73d6349085af04807f07cd5acf4cf2624ccb093b679bc8d0611a9105b1317f3c8 SHA512 e50e2a5ccc415b43e8942d7d240603dc376195b5945a02ea1c57ce9d41356ce724f6de47e7d34369c2170e683f02ed340e0844dbda07860dc6dafd5ba854f302
 DIST davfs2-1.6.0.tar.gz 472511 BLAKE2B aed1ec060d5639fb90a58257038a75c25c2f77a7d6393130ffa3b4d36b92433654b8396dfe4615e4f2ea06d5c6d961d5de27b0347e62d730a22eddd003db71e1 SHA512 e016eb847152b7d0c20abfdafd36f43fcff29339362be6765202a45692a186c70b1c33d3566ed8ca695c399a7f0ca1aef7b05d378cdda33d892cb684da34de33
-EBUILD davfs2-1.6.0.ebuild 1216 BLAKE2B 00b070460c2d604d9fe24e9c9911dda4541910c618b39c8dcd1078a9e1d4f77ee2c45f5b9b13d2a84bcbe62826d9322ca47b5213fda270a8b39bc368938ff894 SHA512 955d23cad9b3715513953b09ae274d2bf7c78c5c71e5a44252fe94cdf92502fc74aed0a869bba6adaf8808b5ad5a6e19b42e4b6cb860a2429daec1c000dd01e3
+EBUILD davfs2-1.6.0.ebuild 1312 BLAKE2B 473edf342d36c14c816a881e9dfd324833f9146c3e5713b8a795fcf0a101526c0cae31e6189bd6b78567869d3ca578dd90307997c28815823be4c26ed2ad0c92 SHA512 cdb8bc88535a1cbdd56f4c16e07aa5df05fedd4e0ed1ce1d5bf1c24fc051cecd5e135a69f04bf600a4af9b4767741ffa0fe6138844ffec130f41ca97ffe770e1
 MISC metadata.xml 252 BLAKE2B 121cab92b026aabfa5b7c05a2df912ac7d860e2462ab2ffa30387fed601b61ee54326d63e2b15d813ae73f01c8a054b9a443f27eecd76c4316412463c33ccda2 SHA512 787d4eba8abc2fc701095db317f299837dac0e794cd4a5b2cab58005e01d3759049e39ff479ba818dd440a5fba46b033ef1ac358d027ae5105cced05b484c20e
diff --git a/net-fs/davfs2/davfs2-1.6.0.ebuild b/net-fs/davfs2/davfs2-1.6.0.ebuild
index f967945cae1e..67767035ccb4 100644
--- a/net-fs/davfs2/davfs2-1.6.0.ebuild
+++ b/net-fs/davfs2/davfs2-1.6.0.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=7
 
+inherit autotools
+
 DESCRIPTION="Linux FUSE (or coda) driver that allows you to mount a WebDAV resource"
 HOMEPAGE="https://savannah.nongnu.org/projects/davfs2"
 SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
@@ -26,6 +28,10 @@ RDEPEND="${RDEPEND}
 	acct-user/davfs2
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.6.0-neon-0.32-support.patch
+)
+
 src_prepare() {
 	local f
 
@@ -35,6 +41,7 @@ src_prepare() {
 	done < <(find "${S}"/man -type f -name 'Makefile.in' -print0)
 
 	default
+	eautoreconf
 }
 
 src_configure() {
diff --git a/net-fs/davfs2/files/davfs2-1.6.0-neon-0.32-support.patch b/net-fs/davfs2/files/davfs2-1.6.0-neon-0.32-support.patch
new file mode 100644
index 000000000000..3a7c316e374b
--- /dev/null
+++ b/net-fs/davfs2/files/davfs2-1.6.0-neon-0.32-support.patch
@@ -0,0 +1,13 @@
+# Gentoo bug https://bugs.gentoo.org/816294
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -36,7 +36,7 @@ AC_PROG_LN_S
+ # Checks for libraries.
+ AM_GNU_GETTEXT_VERSION(0.19.8)
+ AM_GNU_GETTEXT([external])
+-NE_REQUIRE_VERSIONS([0], [27 28 29 30 31])
++NE_REQUIRE_VERSIONS([0], [27 28 29 30 31 32])
+ DAV_CHECK_NEON
+ 
+ # Checks for header files.
diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
index bfd70ae61285..9df3597f6ea2 100644
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -13,5 +13,5 @@ AUX rpc.svcgssd.initd 470 BLAKE2B c610a7abc44b86ca242d59f833ffa6e42f48d1c3bf9342
 DIST nfs-utils-2.5.3.tar.bz2 937544 BLAKE2B 817af2c302cf110519e64353a507645137ffd3b93b46eb94e71d45a1869c9e831e344f0baa33b1b39514962798cca542cf56a2830520c67e96e78995f2bf901f SHA512 3be82f42c5da2bbbca4429459c858c58ae7333725749213c824d0c01b78f0beb7384455f314fc1cc1799968f9f40fd616297c7baf3514ca0e31d4686e9d6e732
 DIST nfs-utils-2.5.4.tar.bz2 943373 BLAKE2B 72ed871613701f5b035941a7aed957771fe3b6a19fefee203130442c292bbbefde35721f2287fef19046d2d837faeda43b06a93a5acdb8ac6240eef90e6dd12c SHA512 b1395c5b06a06246666c48174594b1e08b71cf40b8f94b533497bd92625401a669e2c40e48dbd665891ad2247bc94d7d604d0c5d0f0b66bfe957b03d42e5d305
 EBUILD nfs-utils-2.5.3-r2.ebuild 5780 BLAKE2B 7465645f72e7882744a2336c0ca59e3a68efe334f9e81596c448abcc36adbc00448a6cf9e5d56ae4e06d36e14e6cd598e52a529619f37cbfd5d6b7c2f5c97fcf SHA512 7bce17cb7d41a5fa98f47cd8292ce90e82dd7e7a486d24da44a3c6d04363e895aca050cbe211e62792f4c2d810f95581d224bfae431eb59035c7b45b9c720bd4
-EBUILD nfs-utils-2.5.4-r1.ebuild 5779 BLAKE2B 94982a409df4634131ff2eff8cee11d88e9b22519c4520b562a133087557f65f2a71f7dd28abf834f25d23d97a1785a2eda3610846b05be2c52cab55216bf11d SHA512 87c5a3112e05dbd20e92639dcec2dd24513576ec9ca12cbf8d44fa77680aba293a3b072e93ca70a6a26389e96383ff81bd65db70bdf37e4c131a08c7d67d9a65
+EBUILD nfs-utils-2.5.4-r1.ebuild 5969 BLAKE2B 238047c014497db83cdb5b8fb75602dc704305eada5595a6454741b89e79206df1da1f3b15d4bebfe109da77802a0ae3bc0a638e99c3920a56fa99343b823f5a SHA512 928e55f7662d0ec7edf253f072dca89940f9e95426eb537c77c987bf3bf7ab97eb28e91af0468a76603e0d32284c13014ae629df28d8d96e85454e70cb6a4a57
 MISC metadata.xml 866 BLAKE2B 9bed3ad112962947235d7b03372ab0d0d8a35d57fee9500cc4cfe56dc4182634752878767a03760e06880862910b9c5e6abb91b174a624d1e72682bd6515abd3 SHA512 e7797d23c963836eb16bbea897c9ca761794308bb57e23dd10513e009a36d0ed6bf7e095975cf4f68c7f91ea5b6e9a89c1df1d301613383ef799c545e0c9ff3b
diff --git a/net-fs/nfs-utils/files/nfs.initd b/net-fs/nfs-utils/files/nfs.initd
index da81e6d6684a..da81e6d6684a 100644..100755
--- a/net-fs/nfs-utils/files/nfs.initd
+++ b/net-fs/nfs-utils/files/nfs.initd
diff --git a/net-fs/nfs-utils/files/rpc.gssd.initd b/net-fs/nfs-utils/files/rpc.gssd.initd
index 445d44c44473..445d44c44473 100644..100755
--- a/net-fs/nfs-utils/files/rpc.gssd.initd
+++ b/net-fs/nfs-utils/files/rpc.gssd.initd
diff --git a/net-fs/nfs-utils/files/rpc.idmapd.initd b/net-fs/nfs-utils/files/rpc.idmapd.initd
index 61cfd4de2e73..61cfd4de2e73 100644..100755
--- a/net-fs/nfs-utils/files/rpc.idmapd.initd
+++ b/net-fs/nfs-utils/files/rpc.idmapd.initd
diff --git a/net-fs/nfs-utils/files/rpc.statd.initd b/net-fs/nfs-utils/files/rpc.statd.initd
index ea78b9aef61a..ea78b9aef61a 100644..100755
--- a/net-fs/nfs-utils/files/rpc.statd.initd
+++ b/net-fs/nfs-utils/files/rpc.statd.initd
diff --git a/net-fs/nfs-utils/files/rpc.svcgssd.initd b/net-fs/nfs-utils/files/rpc.svcgssd.initd
index c714e36076f4..c714e36076f4 100644..100755
--- a/net-fs/nfs-utils/files/rpc.svcgssd.initd
+++ b/net-fs/nfs-utils/files/rpc.svcgssd.initd
diff --git a/net-fs/nfs-utils/nfs-utils-2.5.4-r1.ebuild b/net-fs/nfs-utils/nfs-utils-2.5.4-r1.ebuild
index 09b5abbe4c36..1001f5922722 100644
--- a/net-fs/nfs-utils/nfs-utils-2.5.4-r1.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.5.4-r1.ebuild
@@ -19,7 +19,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="caps ipv6 junction kerberos ldap +libmount nfsdcld +nfsidmap +nfsv4 nfsv41 selinux tcpd +uuid"
+IUSE="caps ipv6 junction kerberos ldap +libmount nfsdcld +nfsidmap +nfsv4 nfsv41 sasl selinux tcpd +uuid"
 REQUIRED_USE="kerberos? ( nfsv4 )"
 RESTRICT="test" #315573
 
@@ -28,13 +28,19 @@ RESTRICT="test" #315573
 # so don't depend on virtual/krb.
 # (04 Feb 2005 agriffis)
 DEPEND="
-	>=dev-db/sqlite-3.3
+	dev-db/sqlite:3
 	dev-libs/libxml2
 	net-libs/libtirpc:=
 	>=net-nds/rpcbind-0.2.4
 	sys-fs/e2fsprogs
 	caps? ( sys-libs/libcap )
-	ldap? ( net-nds/openldap )
+	ldap? (
+		net-nds/openldap
+		sasl? (
+			app-crypt/mit-krb5
+			dev-libs/cyrus-sasl:2
+		)
+	)
 	libmount? ( sys-apps/util-linux )
 	nfsv4? (
 		dev-libs/libevent:=
@@ -88,6 +94,11 @@ src_prepare() {
 src_configure() {
 	export libsqlite3_cv_is_recent=yes # Our DEPEND forces this.
 	export ac_cv_header_keyutils_h=$(usex nfsidmap)
+
+	# SASL is consumed in a purely automagic way
+	export ac_cv_header_sasl_h=no
+	export ac_cv_header_sasl_sasl_h=$(usex sasl)
+
 	local myeconfargs=(
 		--disable-static
 		--with-statedir="${EPREFIX}"/var/lib/nfs
diff --git a/net-fs/smbtad/files/smbtad.rc b/net-fs/smbtad/files/smbtad.rc
index afc3e3c13617..afc3e3c13617 100644..100755
--- a/net-fs/smbtad/files/smbtad.rc
+++ b/net-fs/smbtad/files/smbtad.rc