11 files changed, 12 insertions, 73 deletions
diff --git a/metadata/md5-cache/sys-fs/zfs-2.1.13 b/metadata/md5-cache/sys-fs/zfs-2.2.1
index d58b922e..c483edd8 100644
--- a/metadata/md5-cache/sys-fs/zfs-2.1.13
+++ b/metadata/md5-cache/sys-fs/zfs-2.2.1
@@ -1,9 +1,9 @@
 DEFINED_PHASES=-
-DEPEND=~sys-fs/zfs-utils-2.1.13 ~sys-kernel/zfs-dkms-2.1.13
+DEPEND=~sys-fs/zfs-utils-2.2.1 ~sys-kernel/zfs-dkms-2.2.1
 DESCRIPTION=ZFS meta-package (Gentoo compatibility ebuild)
 EAPI=7
 KEYWORDS=amd64
 LICENSE=GPL-2
-RDEPEND=~sys-fs/zfs-utils-2.1.13 ~sys-kernel/zfs-dkms-2.1.13
+RDEPEND=~sys-fs/zfs-utils-2.2.1 ~sys-kernel/zfs-dkms-2.2.1
 SLOT=0
 _md5_=e55b835fd30a4e79085053c624251ca7
diff --git a/metadata/md5-cache/sys-fs/zfs-utils-2.1.13 b/metadata/md5-cache/sys-fs/zfs-utils-2.2.1
index 357b3096..80c69b1a 100644
--- a/metadata/md5-cache/sys-fs/zfs-utils-2.1.13
+++ b/metadata/md5-cache/sys-fs/zfs-utils-2.2.1
@@ -11,6 +11,6 @@ LICENSE=BSD-2 CDDL MIT
 RDEPEND=net-libs/libtirpc:= sys-apps/util-linux sys-libs/zlib virtual/libudev:= dev-libs/openssl:0= pam? ( sys-libs/pam ) 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
 SLOT=0
-SRC_URI=https://github.com/openzfs/zfs-utils/releases/download/zfs-2.1.13/zfs-2.1.13.tar.gz
+SRC_URI=https://github.com/openzfs/zfs-utils/releases/download/zfs-2.2.1/zfs-2.2.1.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	baa4d385108ac87993edac956a916a36	multilib	c19072c3cd7ac5cb21de013f7e9832e0	pam	b56d0c9c20fc5b553f13c8ae165a10a5	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=27776d288b50458b24048939836a7f87
+_md5_=d57fd45904d9765be3b700129afcec01
diff --git a/metadata/md5-cache/sys-kernel/zfs-dkms-2.1.13 b/metadata/md5-cache/sys-kernel/zfs-dkms-2.2.1
index 4290b0f4..0cfdab78 100644
--- a/metadata/md5-cache/sys-kernel/zfs-dkms-2.1.13
+++ b/metadata/md5-cache/sys-kernel/zfs-dkms-2.2.1
@@ -8,6 +8,6 @@ KEYWORDS=amd64
 LICENSE=GPL-2
 RDEPEND=sys-kernel/dkms
 SLOT=0
-SRC_URI=https://github.com/zfsonlinux/zfs/releases/download/zfs-2.1.13/zfs-2.1.13.tar.gz
+SRC_URI=https://github.com/zfsonlinux/zfs/releases/download/zfs-2.2.1/zfs-2.2.1.tar.gz
 _eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	2b02655f061dfa25067b543539110259	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	c61c368a76fdf3a82fdf8dbaebea3804	eutils	d318efeb438bbec051fa5aaf28d0d42c	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	c19072c3cd7ac5cb21de013f7e9832e0	preserve-libs	21162ec96c87041004a75348d97342dd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=b228ff92d78e17fa11b967d26a68b4f5
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index 1d453dfc..d7ae77ab 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -56,8 +56,8 @@ sys-devel/gcc 13.2.0-r10: The GNU Compiler Collection
 sys-fs/cryptsetup 2.6.1-r5: Tool to setup encrypted devices with dm-crypt
 sys-fs/gocryptfs 2.0.1-r1: Encrypted overlay filesystem written in Go
 sys-fs/vhba 20211218: Virtual (SCSI) Host Bus Adapter kernel module for the CDEmu suite
-sys-fs/zfs 2.1.13: ZFS meta-package (Gentoo compatibility ebuild)
-sys-fs/zfs-utils 2.1.13: Userland utilities for ZFS Linux kernel module
+sys-fs/zfs 2.2.1: ZFS meta-package (Gentoo compatibility ebuild)
+sys-fs/zfs-utils 2.2.1: Userland utilities for ZFS Linux kernel module
 sys-kernel/bcmwl-dkms 6.30.223.271-r6: Broadcom's IEEE 802.11a/b/g/n hybrid Linux device driver source
 sys-kernel/dkms 2.3-r3: Dynamic Kernel Module Support
 sys-kernel/dracut 056-r10: Generic initramfs generation tool
@@ -68,7 +68,7 @@ sys-kernel/linux-sources-redcore-lts 5.10.201 5.15.139 6.1.63: Redcore Linux LTS
 sys-kernel/nvidia-drivers-dkms 390.157-r6 470.223.02 535.129.03: NVIDIA driver sources for linux
 sys-kernel/vhba-dkms 20211218-r5: Virtual (SCSI) Host Bus Adapter kernel module for the CDEmu suite sources
 sys-kernel/virtualbox-modules-dkms 7.0.12: Kernel Modules source for Virtualbox
-sys-kernel/zfs-dkms 2.1.13: ZFS sources for linux
+sys-kernel/zfs-dkms 2.2.1: ZFS sources for linux
 sys-power/radeon-profile 20200824-r10: Read current clocks of ATi/AMD Radeon cards
 virtual/libudev 314.1337-r1: Virtual for libudev providers
 virtual/linux-sources 314.1337-r1: Virtual for Linux kernel sources
diff --git a/sys-fs/zfs-utils/Manifest b/sys-fs/zfs-utils/Manifest
index 04e812bc..ed585cac 100644
--- a/sys-fs/zfs-utils/Manifest
+++ b/sys-fs/zfs-utils/Manifest
@@ -1 +1 @@
-DIST zfs-2.1.13.tar.gz 35170063 BLAKE2B 88f4b27a872071590294cf2a93d19633bacfaf1214fc4f06ab7ae7778376978754e0e2566d7bfe659d84426f525ecd05679b98310ddfc2d5938804c36fd03904 SHA512 d06fce8faa22b0cab2c69befa3842476703433fa90530d1fdf168716afd2039e97b124aa8ef581bed3bc19604fa2faa0bc1e29f6d028e3ef0085f0e34e05230a
+DIST zfs-2.2.1.tar.gz 33814243 BLAKE2B c3ff95c892024a11ee5c266b10e3354074606665a201fbab16e1ed12550340e0d991d98bd74f794331b68bd16cd6147a9e8937b8cda72d454abce72a22bafec6 SHA512 05e17046ac4f0ba923151be3e554e075db4783c8936c5dcee2d3b6d459fb386ba33f9eb38d15c185db58a1d26926147a66c3b3fe14e9de40987f0e95efa2bb31
diff --git a/sys-fs/zfs-utils/files/2.1.5-r2-dracut-non-root.patch b/sys-fs/zfs-utils/files/2.1.5-r2-dracut-non-root.patch
deleted file mode 100644
index a9c6130f..00000000
--- a/sys-fs/zfs-utils/files/2.1.5-r2-dracut-non-root.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-https://github.com/openzfs/zfs/commit/eefe83eaa68f7cb4a49c580dd940d3688e42c849
-https://bugs.gentoo.org/854333
-
-From eefe83eaa68f7cb4a49c580dd940d3688e42c849 Mon Sep 17 00:00:00 2001
-From: Toyam Cox <aviator45003@gmail.com>
-Date: Thu, 30 Jun 2022 13:47:58 -0400
-Subject: [PATCH] dracut: fix boot on non-zfs-root systems
-
-Simply prevent overwriting root until it needs to be overwritten.
-
-Dracut could change this value before this module is called, but won't
-change the kernel command line.
-
-Reviewed-by: Andrew J. Hesford <ajh@sideband.org>
-Signed-off-by: Toyam Cox <vaelatern@voidlinux.org>
-Closes #13592
----
- contrib/dracut/90zfs/zfs-lib.sh.in | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/contrib/dracut/90zfs/zfs-lib.sh.in b/contrib/dracut/90zfs/zfs-lib.sh.in
-index e44673c2d75..3a43e514d6f 100755
---- a/contrib/dracut/90zfs/zfs-lib.sh.in
-+++ b/contrib/dracut/90zfs/zfs-lib.sh.in
-@@ -88,11 +88,11 @@ decode_root_args() {
-         return
-     fi
- 
--    root=$(getarg root=)
-+    xroot=$(getarg root=)
-     rootfstype=$(getarg rootfstype=)
- 
-     # shellcheck disable=SC2249
--    case "$root" in
-+    case "$xroot" in
-         ""|zfs|zfs:|zfs:AUTO)
-             root=zfs:AUTO
-             rootfstype=zfs
-@@ -100,7 +100,7 @@ decode_root_args() {
-             ;;
- 
-         ZFS=*|zfs:*)
--            root="${root#zfs:}"
-+            root="${xroot#zfs:}"
-             root="${root#ZFS=}"
-             root=$(echo "$root" | tr '+' ' ')
-             rootfstype=zfs
-@@ -109,9 +109,9 @@ decode_root_args() {
-     esac
- 
-     if [ "$rootfstype" = "zfs" ]; then
--        case "$root" in
-+        case "$xroot" in
-             "") root=zfs:AUTO ;;
--            *)  root=$(echo "$root" | tr '+' ' ') ;;
-+            *)  root=$(echo "$xroot" | tr '+' ' ') ;;
-         esac
-         return 0
-     fi
-
diff --git a/sys-fs/zfs-utils/zfs-utils-2.1.13.ebuild b/sys-fs/zfs-utils/zfs-utils-2.2.1.ebuild
index 5919c1b7..0545a209 100644
--- a/sys-fs/zfs-utils/zfs-utils-2.1.13.ebuild
+++ b/sys-fs/zfs-utils/zfs-utils-2.2.1.ebuild
@@ -50,7 +50,6 @@ RDEPEND="${DEPEND}
 RESTRICT="test"
 
 PATCHES=(
-	"${FILESDIR}"/2.1.5-r2-dracut-non-root.patch
 	"${FILESDIR}"/2.1.5-dracut-zfs-missing.patch
 )
 
diff --git a/sys-fs/zfs/zfs-2.1.13.ebuild b/sys-fs/zfs/zfs-2.2.1.ebuild
index bdcb914c..bdcb914c 100644
--- a/sys-fs/zfs/zfs-2.1.13.ebuild
+++ b/sys-fs/zfs/zfs-2.2.1.ebuild
diff --git a/sys-kernel/zfs-dkms/Manifest b/sys-kernel/zfs-dkms/Manifest
index 04e812bc..ed585cac 100644
--- a/sys-kernel/zfs-dkms/Manifest
+++ b/sys-kernel/zfs-dkms/Manifest
@@ -1 +1 @@
-DIST zfs-2.1.13.tar.gz 35170063 BLAKE2B 88f4b27a872071590294cf2a93d19633bacfaf1214fc4f06ab7ae7778376978754e0e2566d7bfe659d84426f525ecd05679b98310ddfc2d5938804c36fd03904 SHA512 d06fce8faa22b0cab2c69befa3842476703433fa90530d1fdf168716afd2039e97b124aa8ef581bed3bc19604fa2faa0bc1e29f6d028e3ef0085f0e34e05230a
+DIST zfs-2.2.1.tar.gz 33814243 BLAKE2B c3ff95c892024a11ee5c266b10e3354074606665a201fbab16e1ed12550340e0d991d98bd74f794331b68bd16cd6147a9e8937b8cda72d454abce72a22bafec6 SHA512 05e17046ac4f0ba923151be3e554e075db4783c8936c5dcee2d3b6d459fb386ba33f9eb38d15c185db58a1d26926147a66c3b3fe14e9de40987f0e95efa2bb31
diff --git a/sys-kernel/zfs-dkms/files/dkms.conf b/sys-kernel/zfs-dkms/files/dkms.conf
index 1dfe8138..63714364 100644
--- a/sys-kernel/zfs-dkms/files/dkms.conf
+++ b/sys-kernel/zfs-dkms/files/dkms.conf
@@ -1,8 +1,8 @@
 PACKAGE_NAME="zfs-dkms"
-PACKAGE_VERSION="2.1.13"
+PACKAGE_VERSION="2.2.1"
 PACKAGE_CONFIG="/etc/sysconfig/zfs"
 NO_WEAK_MODULES="yes"
-BUILD_EXCLUSIVE_KERNEL="^(5\.[0-9]+\.|6\.[0-5]\.)" # only build for kernels v5.x.x up to and including v6.5.x
+BUILD_EXCLUSIVE_KERNEL="^(5\.[0-9]+\.|6\.[0-6]\.)" # only build for kernels v5.x.x up to and including v6.6.x
 PRE_BUILD="configure
   --prefix=/usr
   --with-config=kernel
diff --git a/sys-kernel/zfs-dkms/zfs-dkms-2.1.13.ebuild b/sys-kernel/zfs-dkms/zfs-dkms-2.2.1.ebuild
index 3caa2acb..3caa2acb 100644
--- a/sys-kernel/zfs-dkms/zfs-dkms-2.1.13.ebuild
+++ b/sys-kernel/zfs-dkms/zfs-dkms-2.2.1.ebuild