summaryrefslogtreecommitdiff
path: root/sys-fs/zfs
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2023-01-28 02:49:59 +0000
committerV3n3RiX <venerix@koprulu.sector>2023-01-28 02:49:59 +0000
commite53aa6b4fbe5a0c6db75d893829f7a6a37a14180 (patch)
treedd095d36490410a724fd271fcdf08c31a5336edd /sys-fs/zfs
parentc5ee568457ac776b65b71fa444e0dd47535bc44a (diff)
gentoo auto-resync : 28:01:2023 - 02:49:59
Diffstat (limited to 'sys-fs/zfs')
-rw-r--r--sys-fs/zfs/Manifest2
-rw-r--r--sys-fs/zfs/zfs-9999.ebuild8
2 files changed, 7 insertions, 3 deletions
diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
index c0d6351dd9bd..5fce6d063a7d 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/Manifest
@@ -11,5 +11,5 @@ DIST zfs-2.1.9.tar.gz 35106538 BLAKE2B d7553cc162687531b254089e29e2e15e2eb6b362c
DIST zfs-2.1.9.tar.gz.asc 836 BLAKE2B 1e76525eab338398dd6ff7539ea4e7d18847d0f40e9093d813ec93fce5fa4c16e09f91c0805ba01a29190f673d131f85442c13035166d6f2d007a7e42dc15486 SHA512 35e1213fcac0458e1243355beba021dfefef455df2b341fbc4b10047f9ed4747df84e319d10ffe4bbcd572fbf014019e0dec200eb4e7d3c116fb805369182cb0
EBUILD zfs-2.1.7-r1.ebuild 9496 BLAKE2B d5336d09ddd165f7306def6fdbfd97cc172a069ef185a3e30ea75421e4e138f96276fa2df4e185568e89dc49c36e64a258fa5b979a6433afbcd41ea7b207c8fa SHA512 a29d0796e982735483d579b174205e6af58a5d3ab098d1855b502bf66f96f12435d303ec2900ecc34cfc0e6f18e7261fcb76ad59660095544d905dda19801d91
EBUILD zfs-2.1.9.ebuild 9181 BLAKE2B f3c26de54d36bb5db43a6adac34e65e704526ceed852a1a0ed2c1dad5f9115c152042a46849e198c9374b5b94d855a8c8fe1f9c2082aad000f69266e4dbf9e83 SHA512 3f9d5352f238790b6960d3bc57e958192c8acfa96f30060335d8823f3e5742fb09ca2e3864c456d6e9429e78d5c7c70d668d2866daa63041403cfd02e4d064e6
-EBUILD zfs-9999.ebuild 8930 BLAKE2B 04df68346f10729128e3dc6ce957e04035c0f1068c69e878502b56e9c58906d4209e91d221fbd8ac044814f8638257e80859b38ca8878c11a0fc486cf5590ac9 SHA512 7b9adb3c513f102dd918b3f827fbebc06dd402668eee844f34b304124144096f8b08518ec99c8883cb0e80a4cafd799dd915d08f4fdf7e99f5457eedb88e36ce
+EBUILD zfs-9999.ebuild 9103 BLAKE2B f09254fe3a100d9e9c1cf2596a3c829bb192e97846ffed560ffeb76d5bd47fb920fbd0be4881f691301973cc63f3e1e9b2e31451bcc2226178e9c80608b91875 SHA512 33bb3dd7bf322776d0aa4dcded628257d3d57aef566bbb090f8f4b24ab0b435925cfe0008b2e245e70f55c7f5d56642a6d4c1e15e08cd48b66346e79285a6f20
MISC metadata.xml 2205 BLAKE2B 82e20a6f5906b8cbbc6eb6e9520cf4e4213ce9cba2b056df5d5db0d4deaa4a20822a88e26286446d105326a8f61c807047a0e1e64494faac48d8ed5708807c02 SHA512 222981f945e98ddef646c593cbc8889f3526af4901c28ab5775ba760ca7d3aff3129b2699e8b7337b59fd33cbba388915cb5b2dc09674432c606f41ff27dbd9b
diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild
index 3232b430a2b5..89a9dd904796 100644
--- a/sys-fs/zfs/zfs-9999.ebuild
+++ b/sys-fs/zfs/zfs-9999.ebuild
@@ -4,7 +4,8 @@
EAPI=8
DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_{9..10} )
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
inherit autotools bash-completion-r1 dist-kernel-utils distutils-r1 flag-o-matic linux-info pam systemd udev usr-ldscript
@@ -52,7 +53,7 @@ BDEPEND="app-alternatives/awk
virtual/pkgconfig
nls? ( sys-devel/gettext )
python? (
- dev-python/setuptools[${PYTHON_USEDEP}]
+ ${DISTUTILS_DEPS}
|| (
dev-python/packaging[${PYTHON_USEDEP}]
dev-python/distlib[${PYTHON_USEDEP}]
@@ -213,6 +214,9 @@ src_configure() {
# Building zfs-mount-generator.c on musl breaks as strndupa
# isn't available. But systemd doesn't support musl anyway, so
# just disable building it.
+ # UPDATE: it has been fixed since,
+ # https://github.com/openzfs/zfs/commit/1f19826c9ac85835cbde61a7439d9d1fefe43a4a
+ # but we still leave it as this for now.
$(use_enable !elibc_musl systemd)
$(use_enable debug)
$(use_enable nls)