gentoo resync : 13.11.2021

5 files changed, 26 insertions, 14 deletions

diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
index c91e5b826deb..fd5db0e00da8 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/Manifest
@@ -5,8 +5,8 @@ DIST zfs-2.0.6.tar.gz 13192941 BLAKE2B 3a83303b016ec4259c286af8a9ceb281829d26508
 DIST zfs-2.0.6.tar.gz.asc 836 BLAKE2B 065eba3361ef4234acc67df0236ab9a6737ba9fe5a706be98b55dd64d10360160ca787d8873f27451a2107225ae657dc4cab20a7c2a268cd2de64c8d82d0327a SHA512 123569ecfcee22ac462160acf61b120144c774bc5c0d46a50d2b7312f7565da1a9d780e1a6207dba5834917c66d5b852763e4a3162378d5c9bb90b0dfde35c5c
 DIST zfs-2.1.1.tar.gz 34836374 BLAKE2B 09ee6bd30e8266342bd975454086049c3fd9142e7dacfe52166575c20e3c92688f9b457d75b2a2068fc281e65f78e1d47450545504cdf8bc31e23663545d7800 SHA512 b69ce764a9f7438ec2c90f86be02abfd684c67cd38de876374e3e6f4b2f82a75d86fa70205def2ba454ad27e52ec8d955ebc4ba456e91d397129a54ea849c19c
 DIST zfs-2.1.1.tar.gz.asc 195 BLAKE2B d886e7dc74270228f98dfc5ca85bbbe897d5a87a5ae8bbfde28e2af1b36218227bc9f1b5902e97beebe160a298857d6e4673829d87cd8039332dc1858cfcffc0 SHA512 d76956b5c1bd547a319e70dd33d50beae39f65fca54532731426d2ef209385a556c51b3936051f75bc3800623c42da5b8d279c51f501a896f5fdfb7b4ed7fb94
-EBUILD zfs-0.8.6-r1.ebuild 6315 BLAKE2B 063ec7b7374c26035f05614ce2cab7e9d73993571edd22fbaa6eeff51b26ebdeba98fe7fae398f4201a12774a672fe444c1f0f56cfae8da7acd1ec35d92cd5c4 SHA512 5ee8f85b288eca30d3540b1fa8de11616f9095385190139478aa59942e0df7e5f089522e145c35ce900c288b1a4f1d13dda66c569a206da73050630b2f3e787b
-EBUILD zfs-2.0.6-r1.ebuild 8150 BLAKE2B 97f5d5db28d6202b7585be544b7fc4f70d19c04b85356525cea2a12a14840f4f5b09119fc51fd5ff7f7b83eee042fedab89f24ca0cc204b2f8e35be21cde38c5 SHA512 2eb2544cdfbfcd24fd9da53afa15c24afcd12eea817df3553022161f250f1d65ed0bac4600d0dc3c34c152df4577248aae3bc56d0a3b8193da9c83f6d2f5ef96
-EBUILD zfs-2.1.1-r2.ebuild 8328 BLAKE2B 4ced1d769042006a93d2a77fdcb89097179cee184704a2eb7ca6a0a1e651c598d17781ac2974221e68dc9bf10107be2a5e0c569f0e0c8efa9c84697f99538b59 SHA512 bcbf86059b5f49f52d408e26cc7fc49eb888b07114b3e0d9675931a5c88d70f4fa8e4daef0bbc87912ee4cb2e84aa507d402bb96163e7ff47f08e2789d929572
-EBUILD zfs-9999.ebuild 8369 BLAKE2B af151107e258c8d391616a9860b12f4394b81e0ef05eea989ee23d9f649f78c126a73a8067873145574c2e3798044363ca5ba5f79fcdec9a4dead46df63103ae SHA512 515a0f26d5c12caeedaf6f8b4c3a1b7c3c735e045980b2c600857ed9412e3b167cf1c02d921efad68c4ee97063a9db71dfff78ce7639357644e70db7d90cbe56
+EBUILD zfs-0.8.6-r1.ebuild 6507 BLAKE2B f43f8cb39ab74e8ab1abef2e42a9c859eeefb27a0c0f301235bcac75d4a865d94d98d9c05762ab18a04e9e981c626734e6d9ee01224c5af711179e06b385bf0a SHA512 12733f40599722d4ff1390f6044b9bbe3e4a4596b84ce922b59c785ff440d5951e2fa7505cd9e5f4b9193b40d88d8e30f99e1c8b83678cff36c796f2014ca42c
+EBUILD zfs-2.0.6-r1.ebuild 8342 BLAKE2B 837fb68deaecc8923cbf780bd0600cdbc0207fa765ba00084041886cde246fa0b680c824d19f5e7705da52acbec8ae34ea5f0e9318aa274c61720c671cd01f32 SHA512 10dfd698fd0fd149ab8a1ecfb468240f9a797e8c0536a242da4a948a0de3045c4608a40f685013d78a35f2c1a5fc675b2da48a0f329ecaff74b537ee35943d4c
+EBUILD zfs-2.1.1-r5.ebuild 8521 BLAKE2B 1ba53dcecbd12d37e83466fe87b96414e273522c459a89ce021288347cdd6bd33c82cc56c9d96777097c2238657c2e624487c2e0d8427b7be52a992cf33b294e SHA512 ca4c86fb5d4ac37ebb5ba5f5b827abae90d5140df3c3f2abb146c37c9d9d85defb9006ad25c762023fa7d2d02798c8e05a0af1bf31265e99c4d2cfe0a2037b91
+EBUILD zfs-9999.ebuild 8446 BLAKE2B f5803888ba025451f15285f1f27ee55a9945e40a09b5a5caffed47ca0fe648df46f5f9a393253f465db9878a310949f4b2b7cf4f014b119175ec9d55e324b04f SHA512 bca04d73af011baa972df8085eda617d9baeddea86f29f0b1b74f1b9dc166476070ef0aae2863daeeba49ad7f3d9a959f5a2680bc69232e26cf4ad0bb813305b
 MISC metadata.xml 1001 BLAKE2B 8e94a0d8e1afff064b3f8e4a7e3e6d34ad12d5fa550df2f3371b1593b0938b3ea0dbfdcd2e40023f4e91bbe12cf1f3633d92977e4f5b4ee10b56d5040f065f90 SHA512 fc7ba310676715f5daa59b30107560f9ba61cc7dc79eb74ff866e4c8f36bd6a414474a216f5c833dc46c6426e4c80a6672b488fab4178a0c00a47b0de1caf6eb
diff --git a/sys-fs/zfs/zfs-0.8.6-r1.ebuild b/sys-fs/zfs/zfs-0.8.6-r1.ebuild
index ac6c6017eaaf..b21a59267cb9 100644
--- a/sys-fs/zfs/zfs-0.8.6-r1.ebuild
+++ b/sys-fs/zfs/zfs-0.8.6-r1.ebuild
@@ -46,7 +46,7 @@ BDEPEND="virtual/awk
 "
 
 RDEPEND="${DEPEND}
-	!kernel-builtin? ( ~sys-fs/zfs-kmod-${PV}:=[dist-kernel?] )
+	!kernel-builtin? ( ~sys-fs/zfs-kmod-${PV}:= )
 	!prefix? ( virtual/udev )
 	sys-fs/udev-init-scripts
 	virtual/awk
@@ -67,6 +67,10 @@ RDEPEND="${DEPEND}
 	)
 "
 
+# PDEPEND in this form is needed to trick portage suggest
+# enabling dist-kernel if only 1 package have it set, without suggesting to disable
+PDEPEND="dist-kernel? ( ~sys-fs/zfs-kmod-${PV}[dist-kernel] )"
+
 REQUIRED_USE="
 	!minimal? ( ${PYTHON_REQUIRED_USE} )
 	python? ( !minimal )
diff --git a/sys-fs/zfs/zfs-2.0.6-r1.ebuild b/sys-fs/zfs/zfs-2.0.6-r1.ebuild
index e12aebe76f0a..c955a9a96516 100644
--- a/sys-fs/zfs/zfs-2.0.6-r1.ebuild
+++ b/sys-fs/zfs/zfs-2.0.6-r1.ebuild
@@ -63,7 +63,7 @@ fi
 
 # awk is used for some scripts, completions, and the Dracut module
 RDEPEND="${DEPEND}
-	!kernel-builtin? ( ~sys-fs/zfs-kmod-${PV}:=[dist-kernel?] )
+	!kernel-builtin? ( ~sys-fs/zfs-kmod-${PV}:= )
 	!prefix? ( virtual/udev )
 	sys-fs/udev-init-scripts
 	virtual/awk
@@ -84,6 +84,10 @@ RDEPEND="${DEPEND}
 	)
 "
 
+# PDEPEND in this form is needed to trick portage suggest
+# enabling dist-kernel if only 1 package have it set, without suggesting to disable
+PDEPEND="dist-kernel? ( ~sys-fs/zfs-kmod-${PV}[dist-kernel] )"
+
 # temporary block new coreutils
 # https://github.com/openzfs/zfs/issues/11900
 RDEPEND+="
diff --git a/sys-fs/zfs/zfs-2.1.1-r2.ebuild b/sys-fs/zfs/zfs-2.1.1-r5.ebuild
index 36d16c857de2..2f2920a75e08 100644
--- a/sys-fs/zfs/zfs-2.1.1-r2.ebuild
+++ b/sys-fs/zfs/zfs-2.1.1-r5.ebuild
@@ -63,7 +63,7 @@ fi
 
 # awk is used for some scripts, completions, and the Dracut module
 RDEPEND="${DEPEND}
-	!kernel-builtin? ( ~sys-fs/zfs-kmod-${PV}:=[dist-kernel?] )
+	!kernel-builtin? ( ~sys-fs/zfs-kmod-${PV}:= )
 	!prefix? ( virtual/udev )
 	sys-fs/udev-init-scripts
 	virtual/awk
@@ -84,6 +84,10 @@ RDEPEND="${DEPEND}
 	)
 "
 
+# PDEPEND in this form is needed to trick portage suggest
+# enabling dist-kernel if only 1 package have it set, without suggesting to disable
+PDEPEND="dist-kernel? ( ~sys-fs/zfs-kmod-${PV}[dist-kernel] )"
+
 # temporary block new coreutils
 # https://github.com/openzfs/zfs/issues/11900
 RDEPEND+="
@@ -98,7 +102,9 @@ REQUIRED_USE="
 
 RESTRICT="test"
 
-PATCHES=( "${FILESDIR}/2.0.4-scrub-timers.patch" )
+PATCHES=(
+	"${FILESDIR}/2.0.4-scrub-timers.patch"
+)
 
 pkg_pretend() {
 	use rootfs || return 0
diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild
index 6cf9307c40d0..2349a5a20d00 100644
--- a/sys-fs/zfs/zfs-9999.ebuild
+++ b/sys-fs/zfs/zfs-9999.ebuild
@@ -67,7 +67,7 @@ fi
 
 # awk is used for some scripts, completions, and the Dracut module
 RDEPEND="${DEPEND}
-	!kernel-builtin? ( ~sys-fs/zfs-kmod-${PV}:=[dist-kernel?] )
+	!kernel-builtin? ( ~sys-fs/zfs-kmod-${PV}:= )
 	!prefix? ( virtual/udev )
 	sys-fs/udev-init-scripts
 	virtual/awk
@@ -88,11 +88,9 @@ RDEPEND="${DEPEND}
 	)
 "
 
-# temporary block new coreutils
-# https://github.com/openzfs/zfs/issues/11900
-RDEPEND+="
-	<sys-apps/coreutils-9
-"
+# PDEPEND in this form is needed to trick portage suggest
+# enabling dist-kernel if only 1 package have it set, without suggesting to disable
+PDEPEND="dist-kernel? ( ~sys-fs/zfs-kmod-${PV}[dist-kernel] )"
 
 REQUIRED_USE="
 	!minimal? ( ${PYTHON_REQUIRED_USE} )