gentoo resync : 06.04.2022

5 files changed, 8 insertions, 13 deletions

diff --git a/sys-auth/sssd/Manifest b/sys-auth/sssd/Manifest
index b2585b8fc18b..415677076a18 100644
--- a/sys-auth/sssd/Manifest
+++ b/sys-auth/sssd/Manifest
@@ -5,7 +5,7 @@ DIST sssd-2.3.1.tar.gz 7186526 BLAKE2B 6d630fe75b9b426ef54adbe1704fde8e01fc34df7
 DIST sssd-2.5.2-CVE-2021-3621.patch.bz2 3155 BLAKE2B c50e331f0f1acbb9ef8e6d54a63219da44df5e565608c24635d85a110fcc024f7d5293c4412bca64831a9a3a14e2c1188be1a802c76575ad6d7a83243d3d89c2 SHA512 650af7c67b3a807935c0875ee877d366facdf818492fb4244757448ad351454a279968ea5414e6b3cd116e873abe4f1aef2ccdaf790a4df0cf7f2a0078a41860
 DIST sssd-2.5.2.tar.gz 7579208 BLAKE2B ec5d9aeaf5b5e05b56c01f9137f6f24db05544dbd48458d742285b60e7beb6d48af865f3415e11ce89e187f4643bbecf15bbb321859ec80cfe458eb781cea6c9 SHA512 a9bac7b2cc23022dce3bcda314c9c26a0a0914c448f6d5a51c5ba18670f04c1fd1a94cb20173235b6285df1dcc9251cb6b3f3e71a220037b4eb66668e6f33c48
 DIST sssd-2.6.0.tar.gz 7440969 BLAKE2B 6b05fcea09ef10a5b2f373dc6a66032edc4c4f46f65f42fdc9ffb5b676025095e16de4a86b3088351c22746e062829d1d68fa7e960cccb7c5a77d960e6d38e2a SHA512 0b9e169424cbadfa6132a3e5e9789facf82f04cce94cb5344b8ff49370ae8817c2cb16cf21caddf6a7cd42e661d5ff5bf97843d79681683aacff0053ff93f64b
-EBUILD sssd-2.3.1-r3.ebuild 7556 BLAKE2B f418cbc6b37b0399c6b960a30fa2bdb6cf40da997c32d037821d48839a560fa412e8a607778ba7117770b0e3cd55be4707d72959d5e4f9f751c519a770120588 SHA512 1895d436d3848b14afe2e14c4cc53a11ca4415548339c2e4e6c0a7944bb5a4c071c4a0fbb7c6744abcef0d918b4222373c3b46fa85c06eba34ff87f2f4ee81e6
-EBUILD sssd-2.5.2-r3.ebuild 7909 BLAKE2B b8a326c3a96f387ae3c004c3966a296eca8d5794453b5c153e0896e4fee8cd42167f0d7d9fb5cf28c60f30f7a115d47c667198137926874e0c2b0fcf76359664 SHA512 eb06a8cab8790a1b5aa1f8f016427804dac12bb93c4af234cdce2df5fde9ea7ffbb2210cb039c085306238761b51876a6f5f59db6800e8d37f6f5edc4b406780
-EBUILD sssd-2.6.0-r2.ebuild 7568 BLAKE2B 2dfc3194cebfa102162b3be60cbb95c68111463b0c3f014bf04d3f7c0a33366051b4f7c76de0bf07a407a82c161fd6e05552819adc62382065c0c5cb4f39c627 SHA512 2247d943a9997c9335ea35a8a3d7e7464880b5aaa32b39ae61f903f84827b82e983e03eb5e1e25f0898dd1cdb6f297e9723a5afe8879dcf99684d0590a52f855
-MISC metadata.xml 1182 BLAKE2B 8667ff4514a6cf81e044c53492760a20b4af07a345f75b48707587ce38903a5b5837e8aea5dec119a5f26cb0a5b7ce4577936cf6d4e666894bc5014ec6fd0c51 SHA512 e375a25d8dc8ccd1ec13e7b4bdf3782441b01ff15a0f0a213dbbb27ff9d30ff455e1efe1711096973b5c814dcb7f269af61cb455290b8948b06451e754b40912
+EBUILD sssd-2.3.1-r3.ebuild 7528 BLAKE2B f36a024d8881a605c51396bebe57acf88f241f9adf54c7378a146a4c4d6ec2021b521330a9d0f463abf1a6a750694114db7218d8d389c96cad1c8ad81a9106eb SHA512 ce3fe293c9829a2350a3a87b6948f038ee4dd01f9998c91dffe6d64a996c8d76d825e641e2596d677e55e3b758e563669b194e46ec542d5afe68bcff104f3736
+EBUILD sssd-2.5.2-r3.ebuild 7881 BLAKE2B 7f2a82a69f593ad0f5748b38f6d10337cce2a94858138ffad768386a172fc724cf5b05c61e7ac2a0bc54d34dddd6ed4292ef17b2d1bf2af2d797ce4d853435c6 SHA512 246229383ed05c0614af0c65d527588d9c3091e5b2fae65383d4fbe8f57b0d30ff194ad2e11ed35f03dea78bf7757e5cf8e53c1da4dbf9169a5ad0ccddc346aa
+EBUILD sssd-2.6.0-r2.ebuild 7529 BLAKE2B a7afccf26014be044d16ff25a6d951afb986d565376b438771822e9bef3fccac2ca0e30b71a3a7b6c61a083e1e79073036c1d90876553108ea30a0eae48a064f SHA512 53bcd7b4d597c64fd9ea5e76e1d83af0be6b86fb61b45d1a096a1a4c22e7a9368b381771af8348a906f5dc630e65a83b175fa4d23ef43f7c624124b5330c1787
+MISC metadata.xml 1178 BLAKE2B 13714a0bc0bcea712f6e03b00f1ba8cf11760a32552b0a07218b542db6e54968bcb8bf99cb1780dae1e06b92dc354aec5436b85887b25dfc951e2f5e7bdfbed1 SHA512 e8bbb2990be12ca9d98918f11839abc00bc1ba339c484ab232ccfcb2a01e940cd5aa1460de5d758390466945f536b6476cbdd67b431eaf014b18a10c449ab36c
diff --git a/sys-auth/sssd/metadata.xml b/sys-auth/sssd/metadata.xml
index 84d171b6aee0..1de148797929 100644
--- a/sys-auth/sssd/metadata.xml
+++ b/sys-auth/sssd/metadata.xml
@@ -13,7 +13,7 @@
 		<flag name="acl"> Build and use the cifsidmap plugin</flag>
 		<flag name="locator">Install sssd's Kerberos plugin</flag>
 		<flag name="netlink">Add support for netlink protocol via <pkg>dev-libs/libnl</pkg></flag>
-		<flag name="nfsv4">Add support for the nfsv4 idmapd plugin provided by <pkg>net-libs/libnfsidmap</pkg></flag>
+		<flag name="nfsv4">Add support for the nfsv4 idmapd plugin provided by <pkg>net-fs/nfs-utils</pkg></flag>
 		<flag name="pac">Add Privileged Attribute Certificate Support for Kerberos</flag>
 		<flag name="sudo">Build helper to let <pkg>app-admin/sudo</pkg> use sssd provided information</flag>
 		<flag name="systemtap">Enable SystemTAP/DTrace tracing</flag>
diff --git a/sys-auth/sssd/sssd-2.3.1-r3.ebuild b/sys-auth/sssd/sssd-2.3.1-r3.ebuild
index fdbe558ed56d..a35c8436b484 100644
--- a/sys-auth/sssd/sssd-2.3.1-r3.ebuild
+++ b/sys-auth/sssd/sssd-2.3.1-r3.ebuild
@@ -46,7 +46,7 @@ DEPEND="
 	)
 	acl? ( net-fs/cifs-utils[acl] )
 	netlink? ( dev-libs/libnl:3 )
-	nfsv4? ( || ( >=net-fs/nfs-utils-2.3.1-r2 net-libs/libnfsidmap ) )
+	nfsv4? ( >=net-fs/nfs-utils-2.3.1-r2 )
 	nls? ( >=sys-devel/gettext-0.18 )
 	pac? (
 		app-crypt/mit-krb5[${MULTILIB_USEDEP}]
diff --git a/sys-auth/sssd/sssd-2.5.2-r3.ebuild b/sys-auth/sssd/sssd-2.5.2-r3.ebuild
index ae761b254289..397f3d136eb5 100644
--- a/sys-auth/sssd/sssd-2.5.2-r3.ebuild
+++ b/sys-auth/sssd/sssd-2.5.2-r3.ebuild
@@ -68,7 +68,7 @@ DEPEND=">=app-crypt/mit-krb5-1.19.1[${MULTILIB_USEDEP}]
 	)
 	acl? ( net-fs/cifs-utils[acl] )
 	netlink? ( dev-libs/libnl:3 )
-	nfsv4? ( || ( >=net-fs/nfs-utils-2.3.1-r2 net-libs/libnfsidmap ) )
+	nfsv4? ( >=net-fs/nfs-utils-2.3.1-r2 )
 	nls? ( >=sys-devel/gettext-0.18 )
 	pac? (
 		net-fs/samba
diff --git a/sys-auth/sssd/sssd-2.6.0-r2.ebuild b/sys-auth/sssd/sssd-2.6.0-r2.ebuild
index b659742f8808..19e7f62ea2af 100644
--- a/sys-auth/sssd/sssd-2.6.0-r2.ebuild
+++ b/sys-auth/sssd/sssd-2.6.0-r2.ebuild
@@ -45,12 +45,7 @@ DEPEND="
 	acl? ( net-fs/cifs-utils[acl] )
 	locator? ( >=net-dns/c-ares-1.10.0-r1:=[${MULTILIB_USEDEP}] )
 	netlink? ( dev-libs/libnl:3 )
-	nfsv4? (
-		|| (
-			>=net-fs/nfs-utils-2.3.1-r2
-			net-libs/libnfsidmap
-		)
-	)
+	nfsv4? ( >=net-fs/nfs-utils-2.3.1-r2 )
 	pac? ( net-fs/samba )
 	python? ( ${PYTHON_DEPS} )
 	samba? ( >=net-fs/samba-4.10.2[winbind] )