gentoo resync : 04.01.2022

5 files changed, 15 insertions, 6 deletions

diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index de5f34a4aa9e..07c3cd6f228d 100644
--- a/net-fs/Manifest.gz
+++ b/net-fs/Manifest.gz
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index b4d23e11b461..73f69eb9c266 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -8,7 +8,7 @@ AUX samba.conf 88 BLAKE2B 5bf3391fdf31b284bfa68b904370776d2e5b14fe0ce5677b4982b5
 DIST samba-4.14.10.tar.gz 19134066 BLAKE2B c6daebc7abbf2ed371ed694e4478d05875d55f7c5a9f83461932eebd7fe9089ff15e0530555d468e64f897d4cadab86e8c0acbfbd20938b3be842cb4324486e2 SHA512 0e1dd386d185cf77a2be4155646e98b3218316b5c290358684ec8eed747ffea67aa7db0937edc971fb791dc47f0f51306db33eb3b8cb65cca8787f18fd4b7f1c
 DIST samba-4.15.2.tar.gz 19252338 BLAKE2B aded33cbefce69c9b20148de1be224514de5cc825404e8188fb0a96022d0fdc6595256f74a5e295fd2e1062e8520775b6c59c1d6a7bf80a52ed9fa9db412dcdd SHA512 6fdf9db0da90332afe527703066cca4ec5b0ec6bf6a5979443953f9fbc18b870a7e2445a41c9ae3d63f7738c9c0282e7ca82f6066aa68e151eec248615ea7b21
 DIST samba-4.15.3.tar.gz 19272345 BLAKE2B ada18904ee7889209488f022daacc34ce1f41c12f9c8c48515cc24aa158072da499cc6ec484cf2b9108c6b2d4074ad734d1850063a354000aa90091faba6f7a6 SHA512 1c30cfa6cd927f4d822dd7227b89542d05d7ab4e50c2d9717eea4fcf1af5120b55d66ec628acd5c887e9bffc732c1d37ab084db953534a2b3987531b10fef63c
-EBUILD samba-4.14.10-r1.ebuild 10166 BLAKE2B 54a6d7d7d7a597925ba56363a397cfd48bf4672f174767d3f0acfbc2a6f8d347c74248a41f3e8a4c1376070ebe68f3b940bfe747f312eede588fc0fe243ee511 SHA512 fe347a0870ab23b647614dedbed04ec09272d26a71948d8737ae8f32ad0c9f4c2c6b048f1b32a6a0c48e5694c904b03db32970e53e741e22b9b8e872d63dd104
-EBUILD samba-4.15.2-r1.ebuild 10034 BLAKE2B 628305a175cdd972833b5b6f51cba1558f27854fd9fb007d7bc9544b610ead925a45ada09c3386f5d6a2998ffb4100dfb574df435cc8581a13abbfe0f2adeb56 SHA512 5b6b433f59270cb79e4c60b3962d999e428660be4187df8fe9f2de30fcdfe3bb9d34a3fa42e6421c53a104e85799e288716f2283f3143e747bd180fe56b3240a
-EBUILD samba-4.15.3.ebuild 9949 BLAKE2B 1bc92f2fa0cde7ab55efbbca413258e0b4761e85cc138c6322ef0693dfbb8a94b110c46107773c4a63b439f9c87b5f81018f9011cb6e25ca957d6a3fa34fd65f SHA512 d67a8eb2a9472cf909fccda201f5bf0f70c24209fbc5ee5b5031f9ffae9e8cc1c722e77ed935f73d67a6829c7e0de6a8867673524c895caafab4644011bed7fc
+EBUILD samba-4.14.10-r2.ebuild 10228 BLAKE2B e10beded76e18d79d78a280a4099e62c3190e9b56e6a5389042e3105bb4221df30b63846b55b4c46adaa7096bd1317edd41936dd6b0eded1970896ce4560f841 SHA512 271c1fc112653695e78feffdea04539cd6cce4b39be167a6cad53c1ff5010f149b1e7bfc7956b2518322d534d990539250e079350ae77356390b0129fa4d6a3e
+EBUILD samba-4.15.2-r2.ebuild 10096 BLAKE2B 92edf79f42f67ae7850388e0db4204099c0ec1a01358ee9cbbc7d6d25404212ce97c05f917810068f80a6aec9d74ad8fa53fa504009b1bdd6402510cc63be919 SHA512 c255639951280b1d37cf3a97cb543114874444686246a23b8ff33b52d9d90bb3e4f6f89a0caae85cd7230aad64789df2441ecabec92dd95d6f48b12b6f17f0b7
+EBUILD samba-4.15.3-r1.ebuild 10011 BLAKE2B afcd89d964900763ff9ed6ae0dac6bb4a137fbf77995c4bf1c2bbcd2466626bc3d1746f37d41fc0e32810b3917b46d6be4a46d1d727b930d54dc0682d955d40d SHA512 f929feeded8ed7dd9463e83f0a509a79f9c5495c7162ab8a347706596b5db0532549f3c2c9201de94408609abfd937d0807d5bb1d75b49eecbfcd8e994053e67
 MISC metadata.xml 2166 BLAKE2B 147e131d456bd90334b48d551e47ce92f0fd7a0708df2f4cce0ffeb3f2e541689090f8edd043411d982574285e06a1b31fb087c18bd02b1296c6e15ccd0b2e92 SHA512 332354a6247d9ef8d50b71e07c66a10fcfbdb34dd876490f8517d0275d87a7d486789c19824c7ccd9066148a92ece3061649bd7ac0b7280cbc695c92ec70ef29
diff --git a/net-fs/samba/samba-4.14.10-r1.ebuild b/net-fs/samba/samba-4.14.10-r2.ebuild
index b075f908df2a..a89e3d9692cc 100644
--- a/net-fs/samba/samba-4.14.10-r1.ebuild
+++ b/net-fs/samba/samba-4.14.10-r2.ebuild
@@ -67,7 +67,10 @@ COMMON_DEPEND="
 	dev-perl/Parse-Yapp
 	>=net-libs/gnutls-3.4.7[${MULTILIB_USEDEP}]
 	net-libs/libnsl:=[${MULTILIB_USEDEP}]
-	sys-libs/e2fsprogs-libs[${MULTILIB_USEDEP}]
+	|| (
+		>=sys-fs/e2fsprogs-1.46.4-r51[${MULTILIB_USEDEP}]
+		sys-libs/e2fsprogs-libs[${MULTILIB_USEDEP}]
+	)
 	>=sys-libs/ldb-2.3.2[ldap(+)?,${MULTILIB_USEDEP}]
 	<sys-libs/ldb-2.4.0[ldap(+)?,${MULTILIB_USEDEP}]
 	sys-libs/libcap[${MULTILIB_USEDEP}]
diff --git a/net-fs/samba/samba-4.15.2-r1.ebuild b/net-fs/samba/samba-4.15.2-r2.ebuild
index fcf892dc2388..20decb463cde 100644
--- a/net-fs/samba/samba-4.15.2-r1.ebuild
+++ b/net-fs/samba/samba-4.15.2-r2.ebuild
@@ -64,7 +64,10 @@ COMMON_DEPEND="
 	dev-libs/popt[${MULTILIB_USEDEP}]
 	dev-perl/Parse-Yapp
 	>=net-libs/gnutls-3.4.7[${MULTILIB_USEDEP}]
-	sys-libs/e2fsprogs-libs[${MULTILIB_USEDEP}]
+	|| (
+		>=sys-fs/e2fsprogs-1.46.4-r51[${MULTILIB_USEDEP}]
+		sys-libs/e2fsprogs-libs[${MULTILIB_USEDEP}]
+	)
 	>=sys-libs/ldb-2.4.1[ldap(+)?,${MULTILIB_USEDEP}]
 	<sys-libs/ldb-2.5.0[ldap(+)?,${MULTILIB_USEDEP}]
 	sys-libs/libcap[${MULTILIB_USEDEP}]
diff --git a/net-fs/samba/samba-4.15.3.ebuild b/net-fs/samba/samba-4.15.3-r1.ebuild
index 05c071ebef13..6efaacf348ca 100644
--- a/net-fs/samba/samba-4.15.3.ebuild
+++ b/net-fs/samba/samba-4.15.3-r1.ebuild
@@ -64,7 +64,10 @@ COMMON_DEPEND="
 	dev-libs/popt[${MULTILIB_USEDEP}]
 	dev-perl/Parse-Yapp
 	>=net-libs/gnutls-3.4.7[${MULTILIB_USEDEP}]
-	sys-libs/e2fsprogs-libs[${MULTILIB_USEDEP}]
+	|| (
+		>=sys-fs/e2fsprogs-1.46.4-r51[${MULTILIB_USEDEP}]
+		sys-libs/e2fsprogs-libs[${MULTILIB_USEDEP}]
+	)
 	>=sys-libs/ldb-2.4.1[ldap(+)?,${MULTILIB_USEDEP}]
 	<sys-libs/ldb-2.5.0[ldap(+)?,${MULTILIB_USEDEP}]
 	sys-libs/libcap[${MULTILIB_USEDEP}]