From dade20ca73a25bdc18da56cb038948b280096c71 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Sun, 15 Dec 2024 15:35:20 +0000
Subject: sys-fs/zfs : version bump, allow dkms build for kernel v6.12.xx
---
sys-fs/zfs-utils/Manifest | 2 +-
sys-fs/zfs-utils/zfs-utils-2.2.6.ebuild | 112 --------------------------------
sys-fs/zfs-utils/zfs-utils-2.2.7.ebuild | 112 ++++++++++++++++++++++++++++++++
sys-fs/zfs/zfs-2.2.6.ebuild | 17 -----
sys-fs/zfs/zfs-2.2.7.ebuild | 17 +++++
5 files changed, 130 insertions(+), 130 deletions(-)
delete mode 100644 sys-fs/zfs-utils/zfs-utils-2.2.6.ebuild
create mode 100644 sys-fs/zfs-utils/zfs-utils-2.2.7.ebuild
delete mode 100644 sys-fs/zfs/zfs-2.2.6.ebuild
create mode 100644 sys-fs/zfs/zfs-2.2.7.ebuild
(limited to 'sys-fs')
diff --git a/sys-fs/zfs-utils/Manifest b/sys-fs/zfs-utils/Manifest
index c17ea78f..31a404de 100644
--- a/sys-fs/zfs-utils/Manifest
+++ b/sys-fs/zfs-utils/Manifest
@@ -1 +1 @@
-DIST zfs-2.2.6.tar.gz 33900138 BLAKE2B 0bbe36df779aaf19460a75725af9c9b13e64e77a6020974ad18d60d9fd52db2ddd6ea98b3e6c7451195bdfb347b8aab51db9b3f9a7c15c77bff47329bbd07dd2 SHA512 c217a3397b67d7239bc30bc492d58fff96bb29c9cf73e390d1787a4fb787cb297557e594a926453fed11faaab80363d40853af271f8ee18ce9a317dfde4c6745
+DIST zfs-2.2.7.tar.gz 33852602 BLAKE2B 31a066d5d543e3328d1afd065a8da4f9b4c52433d585cdbb41936900fd1453431585c6bc4b6e6d9a497a03e79969bae883e17cf4677099686feb3e32577d2777 SHA512 6493faa8e31d9c042c4e8f748d32cb9243212fdf4e0341c19568b47bcf302e60beb89940b80374610b71e1dca1ca5813f3efaddbf1a2453ceabb38381165b271
diff --git a/sys-fs/zfs-utils/zfs-utils-2.2.6.ebuild b/sys-fs/zfs-utils/zfs-utils-2.2.6.ebuild
deleted file mode 100644
index 2ef8e142..00000000
--- a/sys-fs/zfs-utils/zfs-utils-2.2.6.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools bash-completion-r1 flag-o-matic pam toolchain-funcs udev usr-ldscript
-
-MY_PN="zfs"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Userland utilities for ZFS Linux kernel module"
-HOMEPAGE="https://zfsonlinux.org/"
-
-SRC_URI="https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz"
-KEYWORDS="~amd64"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD-2 CDDL MIT"
-SLOT="0"
-IUSE="debug nls pam test-suite unwind"
-
-DEPEND="
- net-libs/libtirpc:=
- sys-apps/util-linux
- sys-libs/zlib
- virtual/libudev:=
- dev-libs/openssl:=
- pam? ( sys-libs/pam )
- unwind? ( sys-libs/libunwind:= )
-"
-
-BDEPEND="app-alternatives/awk
- virtual/pkgconfig
- nls? ( sys-devel/gettext )
-"
-
-RDEPEND="${DEPEND}
- app-alternatives/awk
- virtual/udev
- sys-fs/udev-init-scripts
- test-suite? (
- sys-apps/kmod[tools]
- sys-apps/util-linux
- sys-devel/bc
- sys-block/parted
- sys-fs/lsscsi
- sys-fs/mdadm
- sys-process/procps
- )
-"
-
-RESTRICT="test"
-
-PATCHES=(
- "${FILESDIR}"/2.1.5-dracut-zfs-missing.patch
- "${FILESDIR}"/2.2.2-no-USER_NS.patch
-)
-
-src_prepare() {
- default
-
- # Run unconditionally (bug #792627)
- eautoreconf
-
- # 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
-}
-
-src_configure() {
- local myconf=(
- --bindir="${EPREFIX}/bin"
- --enable-shared
- --disable-systemd
- --enable-sysvinit
- --localstatedir="${EPREFIX}/var"
- --sbindir="${EPREFIX}/sbin"
- --with-config=user
- --with-dracutdir="${EPREFIX}/usr/lib/dracut"
- --with-udevdir="$(get_udevdir)"
- --with-pamconfigsdir="${EPREFIX}/unwanted_files"
- --with-pammoduledir="$(getpam_mod_dir)"
- --with-vendor=redcore
- $(use_enable debug)
- $(use_enable nls)
- $(use_enable pam)
- $(use_with unwind libunwind)
- --disable-pyzfs
- --disable-static
- )
-
- econf "${myconf[@]}"
-}
-
-src_install() {
- default
-
- gen_usr_ldscript -a nvpair uutil zfsbootenv zfs zfs_core zpool
- dobashcomp contrib/bash_completion.d/zfs
- bashcomp_alias zfs zpool
- dodir etc/conf.d
- insinto etc/conf.d
- doins "${S}"/etc/default/zfs
- use pam && { rm -rv "${ED}/unwanted_files" || die ; }
- use test-suite || { rm -r "${ED}/usr/share/zfs" || die ; }
-
- # strip executable bit from conf.d file
- fperms 0644 /etc/conf.d/zfs
-}
diff --git a/sys-fs/zfs-utils/zfs-utils-2.2.7.ebuild b/sys-fs/zfs-utils/zfs-utils-2.2.7.ebuild
new file mode 100644
index 00000000..2ef8e142
--- /dev/null
+++ b/sys-fs/zfs-utils/zfs-utils-2.2.7.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools bash-completion-r1 flag-o-matic pam toolchain-funcs udev usr-ldscript
+
+MY_PN="zfs"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Userland utilities for ZFS Linux kernel module"
+HOMEPAGE="https://zfsonlinux.org/"
+
+SRC_URI="https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz"
+KEYWORDS="~amd64"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD-2 CDDL MIT"
+SLOT="0"
+IUSE="debug nls pam test-suite unwind"
+
+DEPEND="
+ net-libs/libtirpc:=
+ sys-apps/util-linux
+ sys-libs/zlib
+ virtual/libudev:=
+ dev-libs/openssl:=
+ pam? ( sys-libs/pam )
+ unwind? ( sys-libs/libunwind:= )
+"
+
+BDEPEND="app-alternatives/awk
+ virtual/pkgconfig
+ nls? ( sys-devel/gettext )
+"
+
+RDEPEND="${DEPEND}
+ app-alternatives/awk
+ virtual/udev
+ sys-fs/udev-init-scripts
+ test-suite? (
+ sys-apps/kmod[tools]
+ sys-apps/util-linux
+ sys-devel/bc
+ sys-block/parted
+ sys-fs/lsscsi
+ sys-fs/mdadm
+ sys-process/procps
+ )
+"
+
+RESTRICT="test"
+
+PATCHES=(
+ "${FILESDIR}"/2.1.5-dracut-zfs-missing.patch
+ "${FILESDIR}"/2.2.2-no-USER_NS.patch
+)
+
+src_prepare() {
+ default
+
+ # Run unconditionally (bug #792627)
+ eautoreconf
+
+ # 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
+}
+
+src_configure() {
+ local myconf=(
+ --bindir="${EPREFIX}/bin"
+ --enable-shared
+ --disable-systemd
+ --enable-sysvinit
+ --localstatedir="${EPREFIX}/var"
+ --sbindir="${EPREFIX}/sbin"
+ --with-config=user
+ --with-dracutdir="${EPREFIX}/usr/lib/dracut"
+ --with-udevdir="$(get_udevdir)"
+ --with-pamconfigsdir="${EPREFIX}/unwanted_files"
+ --with-pammoduledir="$(getpam_mod_dir)"
+ --with-vendor=redcore
+ $(use_enable debug)
+ $(use_enable nls)
+ $(use_enable pam)
+ $(use_with unwind libunwind)
+ --disable-pyzfs
+ --disable-static
+ )
+
+ econf "${myconf[@]}"
+}
+
+src_install() {
+ default
+
+ gen_usr_ldscript -a nvpair uutil zfsbootenv zfs zfs_core zpool
+ dobashcomp contrib/bash_completion.d/zfs
+ bashcomp_alias zfs zpool
+ dodir etc/conf.d
+ insinto etc/conf.d
+ doins "${S}"/etc/default/zfs
+ use pam && { rm -rv "${ED}/unwanted_files" || die ; }
+ use test-suite || { rm -r "${ED}/usr/share/zfs" || die ; }
+
+ # strip executable bit from conf.d file
+ fperms 0644 /etc/conf.d/zfs
+}
diff --git a/sys-fs/zfs/zfs-2.2.6.ebuild b/sys-fs/zfs/zfs-2.2.6.ebuild
deleted file mode 100644
index bdcb914c..00000000
--- a/sys-fs/zfs/zfs-2.2.6.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=7
-
-DESCRIPTION="ZFS meta-package (Gentoo compatibility ebuild)"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE=""
-
-DEPEND="~sys-fs/zfs-utils-${PV}
- ~sys-kernel/zfs-dkms-${PV}"
-RDEPEND="${DEPEND}"
diff --git a/sys-fs/zfs/zfs-2.2.7.ebuild b/sys-fs/zfs/zfs-2.2.7.ebuild
new file mode 100644
index 00000000..bdcb914c
--- /dev/null
+++ b/sys-fs/zfs/zfs-2.2.7.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=7
+
+DESCRIPTION="ZFS meta-package (Gentoo compatibility ebuild)"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64"
+IUSE=""
+
+DEPEND="~sys-fs/zfs-utils-${PV}
+ ~sys-kernel/zfs-dkms-${PV}"
+RDEPEND="${DEPEND}"
--
cgit v1.2.3