[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs/

["Sam James" <sam@gentoo.org>]

commit:     c6d6fef885e50de439a3a1e12f3e9d6f6281ca52
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  5 13:02:07 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Sep  5 13:03:32 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6d6fef8

sys-fs/zfs: fix whitespace, missync with 2.2.5 (unwind)

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-fs/zfs/zfs-2.2.6.ebuild | 438 ++++++++++++++++++++++----------------------
 1 file changed, 220 insertions(+), 218 deletions(-)

diff --git a/sys-fs/zfs/zfs-2.2.6.ebuild b/sys-fs/zfs/zfs-2.2.6.ebuild
index 87689751ff17..5264247e69af 100644
--- a/sys-fs/zfs/zfs-2.2.6.ebuild
+++ b/sys-fs/zfs/zfs-2.2.6.ebuild
@@ -13,20 +13,20 @@ DESCRIPTION="Userland utilities for ZFS Linux kernel module"
 HOMEPAGE="https://github.com/openzfs/zfs"
 
 if [[ ${PV} == "9999" ]]; then
-        inherit git-r3
-        EGIT_REPO_URI="https://github.com/openzfs/zfs.git"
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/openzfs/zfs.git"
 else
-        VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/openzfs.asc
-        inherit verify-sig
+	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/openzfs.asc
+	inherit verify-sig
 
-        MY_P="${P/_rc/-rc}"
-        SRC_URI="https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz"
-        SRC_URI+=" verify-sig? ( https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz.asc )"
-        S="${WORKDIR}/${MY_P}"
+	MY_P="${P/_rc/-rc}"
+	SRC_URI="https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz"
+	SRC_URI+=" verify-sig? ( https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz.asc )"
+	S="${WORKDIR}/${MY_P}"
 
-        if [[ ${PV} != *_rc* ]]; then
-                KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~sparc"
-        fi
+	if [[ ${PV} != *_rc* ]]; then
+		KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~sparc"
+	fi
 fi
 
 LICENSE="BSD-2 CDDL MIT"
@@ -34,61 +34,62 @@ LICENSE="BSD-2 CDDL MIT"
 # possible candidates: libuutil, libzpool, libnvpair. Those do not provide stable abi, but are considered.
 # see libsoversion_check() below as well
 SLOT="0/5"
-IUSE="custom-cflags debug dist-kernel kernel-builtin minimal nls pam python +rootfs selinux test-suite"
+IUSE="custom-cflags debug dist-kernel kernel-builtin minimal nls pam python +rootfs selinux test-suite unwind"
 
 DEPEND="
-        dev-libs/openssl:=
-        net-libs/libtirpc:=
-        sys-apps/util-linux
-        sys-libs/zlib
-        virtual/libudev:=
-        !minimal? ( ${PYTHON_DEPS} )
-        pam? ( sys-libs/pam )
-        python? (
-                $(python_gen_cond_dep 'dev-python/cffi[${PYTHON_USEDEP}]' 'python*')
-        )
+	dev-libs/openssl:=
+	net-libs/libtirpc:=
+	sys-apps/util-linux
+	sys-libs/zlib
+	virtual/libudev:=
+	!minimal? ( ${PYTHON_DEPS} )
+	pam? ( sys-libs/pam )
+	python? (
+		$(python_gen_cond_dep 'dev-python/cffi[${PYTHON_USEDEP}]' 'python*')
+	)
+	unwind? ( sys-libs/libunwind:= )
 "
 
 BDEPEND="
-        app-alternatives/awk
-        virtual/pkgconfig
-        nls? ( sys-devel/gettext )
-        python? (
-                ${DISTUTILS_DEPS}
-                || (
-                        dev-python/packaging[${PYTHON_USEDEP}]
-                        dev-python/distlib[${PYTHON_USEDEP}]
-                )
-        )
+	app-alternatives/awk
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	python? (
+		${DISTUTILS_DEPS}
+		|| (
+			dev-python/packaging[${PYTHON_USEDEP}]
+			dev-python/distlib[${PYTHON_USEDEP}]
+		)
+	)
 "
 
 if [[ ${PV} != "9999" ]] ; then
-        BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-openzfs )"
+	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-openzfs )"
 fi
 
 # awk is used for some scripts, completions, and the Dracut module
 RDEPEND="
-        ${DEPEND}
-        !kernel-builtin? ( ~sys-fs/zfs-kmod-${PV}:= )
-        !prefix? ( virtual/udev )
-        app-alternatives/awk
-        sys-fs/udev-init-scripts
-        dist-kernel? ( virtual/dist-kernel:= )
-        rootfs? (
-                app-alternatives/cpio
-                app-misc/pax-utils
-        )
-        selinux? ( sec-policy/selinux-zfs )
-        test-suite? (
-                app-shells/ksh
-                sys-apps/kmod[tools]
-                sys-apps/util-linux
-                app-alternatives/bc
-                sys-block/parted
-                sys-fs/lsscsi
-                sys-fs/mdadm
-                sys-process/procps
-        )
+	${DEPEND}
+	!kernel-builtin? ( ~sys-fs/zfs-kmod-${PV}:= )
+	!prefix? ( virtual/udev )
+	app-alternatives/awk
+	sys-fs/udev-init-scripts
+	dist-kernel? ( virtual/dist-kernel:= )
+	rootfs? (
+		app-alternatives/cpio
+		app-misc/pax-utils
+	)
+	selinux? ( sec-policy/selinux-zfs )
+	test-suite? (
+		app-shells/ksh
+		sys-apps/kmod[tools]
+		sys-apps/util-linux
+		app-alternatives/bc
+		sys-block/parted
+		sys-fs/lsscsi
+		sys-fs/mdadm
+		sys-process/procps
+	)
 "
 
 # PDEPEND in this form is needed to trick portage suggest
@@ -96,213 +97,214 @@ RDEPEND="
 PDEPEND="dist-kernel? ( ~sys-fs/zfs-kmod-${PV}[dist-kernel] )"
 
 REQUIRED_USE="
-        !minimal? ( ${PYTHON_REQUIRED_USE} )
-        python? ( !minimal )
-        test-suite? ( !minimal )
+	!minimal? ( ${PYTHON_REQUIRED_USE} )
+	python? ( !minimal )
+	test-suite? ( !minimal )
 "
 
 RESTRICT="test"
 
 PATCHES=(
-        "${FILESDIR}"/2.1.5-dracut-zfs-missing.patch
-        "${FILESDIR}"/2.2.2-no-USER_NS.patch
-        "${FILESDIR}"/2.2.3-musl.patch
+	"${FILESDIR}"/2.1.5-dracut-zfs-missing.patch
+	"${FILESDIR}"/2.2.2-no-USER_NS.patch
+	"${FILESDIR}"/2.2.3-musl.patch
 )
 
 pkg_pretend() {
-        use rootfs || return 0
-
-        if has_version virtual/dist-kernel && ! use dist-kernel; then
-                ewarn "You have virtual/dist-kernel installed, but"
-                ewarn "USE=\"dist-kernel\" is not enabled for ${CATEGORY}/${PN}"
-                ewarn "It's recommended to globally enable dist-kernel USE flag"
-                ewarn "to auto-trigger initrd rebuilds with kernel updates"
-        fi
+	use rootfs || return 0
+
+	if has_version virtual/dist-kernel && ! use dist-kernel; then
+		ewarn "You have virtual/dist-kernel installed, but"
+		ewarn "USE=\"dist-kernel\" is not enabled for ${CATEGORY}/${PN}"
+		ewarn "It's recommended to globally enable dist-kernel USE flag"
+		ewarn "to auto-trigger initrd rebuilds with kernel updates"
+	fi
 }
 
 pkg_setup() {
-        if use kernel_linux; then
-                linux-info_pkg_setup
-
-                if ! linux_config_exists; then
-                        ewarn "Cannot check the linux kernel configuration."
-                else
-                        if use test-suite; then
-                                if linux_chkconfig_present BLK_DEV_LOOP; then
-                                        eerror "The ZFS test suite requires loop device support enabled."
-                                        eerror "Please enable it:"
-                                        eerror "    CONFIG_BLK_DEV_LOOP=y"
-                                        eerror "in /usr/src/linux/.config or"
-                                        eerror "    Device Drivers --->"
-                                        eerror "        Block devices --->"
-                                        eerror "            [X] Loopback device support"
-                                fi
-                        fi
-                fi
-        fi
+	if use kernel_linux; then
+		linux-info_pkg_setup
+
+		if ! linux_config_exists; then
+			ewarn "Cannot check the linux kernel configuration."
+		else
+			if use test-suite; then
+				if linux_chkconfig_present BLK_DEV_LOOP; then
+					eerror "The ZFS test suite requires loop device support enabled."
+					eerror "Please enable it:"
+					eerror "    CONFIG_BLK_DEV_LOOP=y"
+					eerror "in /usr/src/linux/.config or"
+					eerror "    Device Drivers --->"
+					eerror "        Block devices --->"
+					eerror "            [X] Loopback device support"
+				fi
+			fi
+		fi
+	fi
 }
 
 libsoversion_check() {
-        local bugurl libzfs_sover
-        bugurl="https://bugs.gentoo.org/enter_bug.cgi?form_name=enter_bug&product=Gentoo+Linux&component=Current+packages"
-
-        libzfs_sover="$(grep 'libzfs_la_LDFLAGS += -version-info' lib/libzfs/Makefile.am \
-                | grep -Eo '[0-9]+:[0-9]+:[0-9]+')"
-        libzfs_sover="${libzfs_sover%%:*}"
-
-        if [[ ${libzfs_sover} -ne $(ver_cut 2 ${SLOT}) ]]; then
-                echo
-                eerror "BUG BUG BUG BUG BUG BUG BUG BUG"
-                eerror "ebuild subslot does not match libzfs soversion!"
-                eerror "libzfs soversion: ${libzfs_sover}"
-                eerror "ebuild value: $(ver_cut 2 ${SLOT})"
-                eerror "This is a bug in the ebuild, please use the following URL to report it"
-                eerror "${bugurl}&short_desc=${CATEGORY}%2F${P}+update+subslot"
-                echo
-                # we want to abort for releases, but just print a warning for live ebuild
-                # to keep package installable
-                [[  ${PV} == "9999" ]] || die
-        fi
+	local bugurl libzfs_sover
+	bugurl="https://bugs.gentoo.org/enter_bug.cgi?form_name=enter_bug&product=Gentoo+Linux&component=Current+packages"
+
+	libzfs_sover="$(grep 'libzfs_la_LDFLAGS += -version-info' lib/libzfs/Makefile.am \
+		| grep -Eo '[0-9]+:[0-9]+:[0-9]+')"
+	libzfs_sover="${libzfs_sover%%:*}"
+
+	if [[ ${libzfs_sover} -ne $(ver_cut 2 ${SLOT}) ]]; then
+		echo
+		eerror "BUG BUG BUG BUG BUG BUG BUG BUG"
+		eerror "ebuild subslot does not match libzfs soversion!"
+		eerror "libzfs soversion: ${libzfs_sover}"
+		eerror "ebuild value: $(ver_cut 2 ${SLOT})"
+		eerror "This is a bug in the ebuild, please use the following URL to report it"
+		eerror "${bugurl}&short_desc=${CATEGORY}%2F${P}+update+subslot"
+		echo
+		# we want to abort for releases, but just print a warning for live ebuild
+		# to keep package installable
+		[[  ${PV} == "9999" ]] || die
+	fi
 }
 
 src_prepare() {
-        default
-        libsoversion_check
+	default
+	libsoversion_check
 
-        # Run unconditionally (bug #792627)
-        eautoreconf
+	# Run unconditionally (bug #792627)
+	eautoreconf
 
-        if [[ ${PV} != "9999" ]]; then
-                # Set revision number
-                sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" META || die "Could not set Gentoo release"
-        fi
+	if [[ ${PV} != "9999" ]]; then
+		# Set revision number
+		sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" META || die "Could not set Gentoo release"
+	fi
 
-        if use python; then
-                pushd contrib/pyzfs >/dev/null || die
-                distutils-r1_src_prepare
-                popd >/dev/null || die
-        fi
+	if use python; then
+		pushd contrib/pyzfs >/dev/null || die
+		distutils-r1_src_prepare
+		popd >/dev/null || die
+	fi
 
-        # Tries to use /etc/conf.d which we reserve for OpenRC
-        sed -i -e '/EnvironmentFile/d' etc/systemd/system/zfs*.in || die
+	# Tries to use /etc/conf.d which we reserve for OpenRC
+	sed -i -e '/EnvironmentFile/d' etc/systemd/system/zfs*.in || die
 
-        # prevent errors showing up on zfs-mount stop, #647688
-        # openrc will unmount all filesystems anyway.
-        sed -i "/^ZFS_UNMOUNT=/ s/yes/no/" "etc/default/zfs.in" || die
+	# prevent errors showing up on zfs-mount stop, #647688
+	# openrc will unmount all filesystems anyway.
+	sed -i "/^ZFS_UNMOUNT=/ s/yes/no/" "etc/default/zfs.in" || die
 }
 
 src_configure() {
-        use custom-cflags || strip-flags
-        use minimal || python_setup
-
-        local myconf=(
-                --bindir="${EPREFIX}/bin"
-                --enable-shared
-                --enable-sysvinit
-                --localstatedir="${EPREFIX}/var"
-                --sbindir="${EPREFIX}/sbin"
-                --with-config=user
-                --with-dracutdir="${EPREFIX}/usr/lib/dracut"
-                --with-linux="${KV_DIR}"
-                --with-linux-obj="${KV_OUT_DIR}"
-                --with-udevdir="$(get_udevdir)"
-                --with-pamconfigsdir="${EPREFIX}/unwanted_files"
-                --with-pammoduledir="$(getpam_mod_dir)"
-                --with-systemdunitdir="$(systemd_get_systemunitdir)"
-                --with-systemdpresetdir="$(systemd_get_systempresetdir)"
-                --with-vendor=gentoo
-                # 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)
-                $(use_enable pam)
-                $(use_enable python pyzfs)
-                --disable-static
-                $(usex minimal --without-python --with-python="${EPYTHON}")
-        )
-
-        econf "${myconf[@]}"
+	use custom-cflags || strip-flags
+	use minimal || python_setup
+
+	local myconf=(
+		--bindir="${EPREFIX}/bin"
+		--enable-shared
+		--enable-sysvinit
+		--localstatedir="${EPREFIX}/var"
+		--sbindir="${EPREFIX}/sbin"
+		--with-config=user
+		--with-dracutdir="${EPREFIX}/usr/lib/dracut"
+		--with-linux="${KV_DIR}"
+		--with-linux-obj="${KV_OUT_DIR}"
+		--with-udevdir="$(get_udevdir)"
+		--with-pamconfigsdir="${EPREFIX}/unwanted_files"
+		--with-pammoduledir="$(getpam_mod_dir)"
+		--with-systemdunitdir="$(systemd_get_systemunitdir)"
+		--with-systemdpresetdir="$(systemd_get_systempresetdir)"
+		--with-vendor=gentoo
+		# 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)
+		$(use_enable pam)
+		$(use_enable python pyzfs)
+		$(use_with unwind libunwind)
+		--disable-static
+		$(usex minimal --without-python --with-python="${EPYTHON}")
+	)
+
+	econf "${myconf[@]}"
 }
 
 src_compile() {
-        default
-        if use python; then
-                pushd contrib/pyzfs >/dev/null || die
-                distutils-r1_src_compile
-                popd >/dev/null || die
-        fi
+	default
+	if use python; then
+		pushd contrib/pyzfs >/dev/null || die
+		distutils-r1_src_compile
+		popd >/dev/null || die
+	fi
 }
 
 src_install() {
-        default
+	default
 
-        gen_usr_ldscript -a nvpair uutil zfsbootenv zfs zfs_core zpool
+	gen_usr_ldscript -a nvpair uutil zfsbootenv zfs zfs_core zpool
 
-        use pam && { rm -rv "${ED}/unwanted_files" || die ; }
+	use pam && { rm -rv "${ED}/unwanted_files" || die ; }
 
-        use test-suite || { rm -r "${ED}"/usr/share/zfs/{test-runner,zfs-tests,runfiles,*sh} || die ; }
+	use test-suite || { rm -r "${ED}"/usr/share/zfs/{test-runner,zfs-tests,runfiles,*sh} || die ; }
 
-        find "${ED}" -name '*.la' -delete || die
+	find "${ED}" -name '*.la' -delete || die
 
-        dobashcomp contrib/bash_completion.d/zfs
-        bashcomp_alias zfs zpool
+	dobashcomp contrib/bash_completion.d/zfs
+	bashcomp_alias zfs zpool
 
-        # strip executable bit from conf.d file
-        fperms 0644 /etc/conf.d/zfs
+	# strip executable bit from conf.d file
+	fperms 0644 /etc/conf.d/zfs
 
-        if use python; then
-                pushd contrib/pyzfs >/dev/null || die
-                distutils-r1_src_install
-                popd >/dev/null || die
-        fi
+	if use python; then
+		pushd contrib/pyzfs >/dev/null || die
+		distutils-r1_src_install
+		popd >/dev/null || die
+	fi
 
-        # enforce best available python implementation
-        use minimal || python_fix_shebang "${ED}/bin"
+	# enforce best available python implementation
+	use minimal || python_fix_shebang "${ED}/bin"
 }
 
 pkg_postinst() {
-        udev_reload
-
-        # we always need userspace utils in sync with zfs-kmod
-        # so force initrd update for userspace as well, to avoid
-        # situation when zfs-kmod trigger initrd rebuild before
-        # userspace component is rebuilt
-        # KV_* variables are provided by linux-info.eclass
-        if [[ -z ${ROOT} ]] && use dist-kernel; then
-                dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}"
-        fi
-
-        if use rootfs; then
-                if ! has_version sys-kernel/genkernel && ! has_version sys-kernel/dracut; then
-                        elog "Root on zfs requires an initramfs to boot"
-                        elog "The following packages provide one and are tested on a regular basis:"
-                        elog "  sys-kernel/dracut ( preferred, module maintained by zfs developers )"
-                        elog "  sys-kernel/genkernel"
-                fi
-        fi
-
-        if systemd_is_booted || has_version sys-apps/systemd; then
-                einfo "Please refer to ${EROOT}/$(systemd_get_systempresetdir)/50-zfs.preset"
-                einfo "for default zfs systemd service configuration"
-        else
-                [[ -e "${EROOT}/etc/runlevels/boot/zfs-import" ]] || \
-                        einfo "You should add zfs-import to the boot runlevel."
-                [[ -e "${EROOT}/etc/runlevels/boot/zfs-load-key" ]] || \
-                        einfo "You should add zfs-load-key to the boot runlevel."
-                [[ -e "${EROOT}/etc/runlevels/boot/zfs-mount" ]]|| \
-                        einfo "You should add zfs-mount to the boot runlevel."
-                [[ -e "${EROOT}/etc/runlevels/default/zfs-share" ]] || \
-                        einfo "You should add zfs-share to the default runlevel."
-                [[ -e "${EROOT}/etc/runlevels/default/zfs-zed" ]] || \
-                        einfo "You should add zfs-zed to the default runlevel."
-        fi
+	udev_reload
+
+	# we always need userspace utils in sync with zfs-kmod
+	# so force initrd update for userspace as well, to avoid
+	# situation when zfs-kmod trigger initrd rebuild before
+	# userspace component is rebuilt
+	# KV_* variables are provided by linux-info.eclass
+	if [[ -z ${ROOT} ]] && use dist-kernel; then
+		dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}"
+	fi
+
+	if use rootfs; then
+		if ! has_version sys-kernel/genkernel && ! has_version sys-kernel/dracut; then
+			elog "Root on zfs requires an initramfs to boot"
+			elog "The following packages provide one and are tested on a regular basis:"
+			elog "  sys-kernel/dracut ( preferred, module maintained by zfs developers )"
+			elog "  sys-kernel/genkernel"
+		fi
+	fi
+
+	if systemd_is_booted || has_version sys-apps/systemd; then
+		einfo "Please refer to ${EROOT}/$(systemd_get_systempresetdir)/50-zfs.preset"
+		einfo "for default zfs systemd service configuration"
+	else
+		[[ -e "${EROOT}/etc/runlevels/boot/zfs-import" ]] || \
+			einfo "You should add zfs-import to the boot runlevel."
+		[[ -e "${EROOT}/etc/runlevels/boot/zfs-load-key" ]] || \
+			einfo "You should add zfs-load-key to the boot runlevel."
+		[[ -e "${EROOT}/etc/runlevels/boot/zfs-mount" ]]|| \
+			einfo "You should add zfs-mount to the boot runlevel."
+		[[ -e "${EROOT}/etc/runlevels/default/zfs-share" ]] || \
+			einfo "You should add zfs-share to the default runlevel."
+		[[ -e "${EROOT}/etc/runlevels/default/zfs-zed" ]] || \
+			einfo "You should add zfs-zed to the default runlevel."
+	fi
 }
 
 pkg_postrm() {
-        udev_reload
+	udev_reload
 }