sys-fs/zfs-kmod: drop 2.1.7, 2.1.10-r1

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

5 files changed, 0 insertions, 724 deletions

diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index c2835e7dc8d2..591c3082e3c1 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -1,11 +1,7 @@
-DIST zfs-2.1.10.tar.gz 35101856 BLAKE2B 5b1a17d192097f5eab1ef3192217fa34b276b6f344a5114a5411be43208616ac682ae2129ae9da15b4ba6207171ae82140f823041a8067441459d51d994df271 SHA512 3189c6f822c7b6caba650a43f321114ef0bd42b72f566c44ba2400005c61cc3d420149a72520aed5b94494c51c35629a6f645273941774d964f2b61c31c366b2
-DIST zfs-2.1.10.tar.gz.asc 836 BLAKE2B 5a6b408932cb4f39f5a226598527115aa4fa6c105c8b8ad9f236a5909a948150db712bb1f35e4e16a2b7fc7e434530f93c6a6cd2aab40d628b1ded9891694578 SHA512 a45bcce13e7261f90feda51a131fa0c86e2d3c2711286a462072fb120ccbc85719c2bbecb441147a057accffb841ca82df0ba65e1abc0ece9dea8a97cfa31af5
 DIST zfs-2.1.11.tar.gz 35100716 BLAKE2B 991ac2347bcd452812e247358e2c44a04a88e700d25878b5b95f86939e6114e1205e7afabfd2a1ea9220947876511374d7224aa587d3d66184838d705f71a89a SHA512 335a543644d2dbba919213a28cc5922bf6a118fc19069db84562ce056449a2d6ca4ba827e54f304ab7d9be22260aa9b255134f1b12e2bc98890f757f35e48bd7
 DIST zfs-2.1.11.tar.gz.asc 836 BLAKE2B 0b904d8e1de2dd08a377efc94e32862192d6b9ccb8628af058a71b3ea51f5e483e0cf527906cd222fe9b41b28ca0b30b0efa07d97c480e5546f6e2bed8cbcb01 SHA512 7329e62012ba64288345d8959611de82502ef1da4020e215462fbb2ed209413ec8638d211a31dd6e70be71c998f1da1d8a0d19e5df1f2778782ebb988c94aa41
 DIST zfs-2.1.12.tar.gz 35155013 BLAKE2B 652780e6bf7b63f45909110726d53795fada034f6044c8393fa3980e30217ada6931e3c2bb57210719e3c78c16f973f69287b7e2b475601f4ce12d701d9d96ae SHA512 f48493a21883e441cda705fb085353bed033f1620a1d0f93069c345c76cf2c0759a2e6f7a80c47c9398e9878abfe1d90d931fe5ceaf2588770a71491a434631e
 DIST zfs-2.1.12.tar.gz.asc 836 BLAKE2B 9215e732981a82254115cd17ec3c9810d4e9e5d5f7bb848778848f911478fc2e4bdbfc563e9835a2e876c26d9e0e8755724a0995baf9ad24e9265123e10cfddf SHA512 69c8b618947fd966eba0bba1c7326ddd463861f051a6cf1d06e23bd6d840fe7503f02adec2c3cbb203fa7b1cced51500f3689c224b653d13d227edd51b5a44f6
-DIST zfs-2.1.7.tar.gz 35092436 BLAKE2B 9c85c3eb72f3bb39bc4fd44aaa80338ca197a4e8183436fee73cd56705abfdaecfaf1b6fbe8dd508ccce707c8259c7ab6e1733b60b17757f0a7ff92d4e52bbad SHA512 6a31eb8fbee90ad1abcfedb9000991761aff7591b11362eb5ec6e0bb4b785a7004a251439409d7bd3f51fc995c859614da6313655337952f70bae07ac8ee0140
-DIST zfs-2.1.7.tar.gz.asc 836 BLAKE2B 648fb818860a1cecc2ec42f23102e0466c038bfe48f5feca1ab58afb9cb439a0fe51cb89941f63a05c14d3b6f95c64dd3910c9a06b9cac14c467b963c65c2948 SHA512 4d4fef707bdfc37a82eb79aa0a21c71e30779bcf2ac54fe2df45a03e3302e2a45cb9f4e4ff0122b892b1e608a9f09e86d1334e0c7d9bf681780505f6e1439f9f
 DIST zfs-2.1.9.tar.gz 35106538 BLAKE2B d7553cc162687531b254089e29e2e15e2eb6b362cecd8e70c24bbb5dbffbde82036ad2d416f4caeceaa324bee8a2e59d9e3cd8a3bf55a2e3c0718c7af9562812 SHA512 a3c410abe911be7d3d66af8ad7023a810eb4ae3284001e544c3a34275eb17a4916a7c094936a2628a590007c007eea84673efa9f3201fd9f24c499fd5ed3ed75
 DIST zfs-2.1.9.tar.gz.asc 836 BLAKE2B 1e76525eab338398dd6ff7539ea4e7d18847d0f40e9093d813ec93fce5fa4c16e09f91c0805ba01a29190f673d131f85442c13035166d6f2d007a7e42dc15486 SHA512 35e1213fcac0458e1243355beba021dfefef455df2b341fbc4b10047f9ed4747df84e319d10ffe4bbcd572fbf014019e0dec200eb4e7d3c116fb805369182cb0
 DIST zfs-2.2.0-rc1.tar.gz 33656024 BLAKE2B 1157db51d2736905b787a2627e599d7ac527be281edc9a76da0f746ae39483df3b4b8b31e5af504b9b06cd99a3776cd16670a8774d0e68f50014b09971209437 SHA512 22285ea1b34d4dbed311e3855449cad51c6f6ddb29c906f106fa6f4816d8e478f073b29fbc4d9636bf783558e041b20d2f2c5c0c33f65153d3b21da6cd9b7689
diff --git a/sys-fs/zfs-kmod/files/2.1.10-Revert-ZFS_IOC_COUNT_FILLED-does-unnecessary-txg_wai.patch b/sys-fs/zfs-kmod/files/2.1.10-Revert-ZFS_IOC_COUNT_FILLED-does-unnecessary-txg_wai.patch
deleted file mode 100644
index 150d1b5145d9..000000000000
--- a/sys-fs/zfs-kmod/files/2.1.10-Revert-ZFS_IOC_COUNT_FILLED-does-unnecessary-txg_wai.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From ac6b8f40981cb9328c22a3485e1a4b060ea89b1e Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Sun, 16 Apr 2023 04:49:04 +0100
-Subject: [PATCH] Revert "ZFS_IOC_COUNT_FILLED does unnecessary
- txg_wait_synced()"
-
-This reverts commit 4b3133e671b958fa2c915a4faf57812820124a7b.
-
-See #14753 - possible corruption again, very similar symptoms to the
-nightmare that was #11900 and same area of code.
-
-We can safely revert it as it's an optimisation rather than a bugfix
-in itself.
-
-Bug: https://github.com/openzfs/zfs/issues/14753
-Bug: https://github.com/openzfs/zfs/issues/11900
-Signed-off-by: Sam James <sam@gentoo.org>
---- a/module/zfs/dnode.c
-+++ b/module/zfs/dnode.c
-@@ -1773,29 +1773,20 @@ dnode_try_claim(objset_t *os, uint64_t object, int slots)
- }
- 
- /*
-- * Checks if the dnode might contain any uncommitted changes to data blocks.
-- * Dirty metadata (e.g. bonus buffer) does not count.
-+ * Checks if the dnode contains any uncommitted dirty records.
-  */
- boolean_t
- dnode_is_dirty(dnode_t *dn)
- {
- 	mutex_enter(&dn->dn_mtx);
-+
- 	for (int i = 0; i < TXG_SIZE; i++) {
--		list_t *list = &dn->dn_dirty_records[i];
--		for (dbuf_dirty_record_t *dr = list_head(list);
--		    dr != NULL; dr = list_next(list, dr)) {
--			if (dr->dr_dbuf == NULL ||
--			    (dr->dr_dbuf->db_blkid != DMU_BONUS_BLKID &&
--			    dr->dr_dbuf->db_blkid != DMU_SPILL_BLKID)) {
--				mutex_exit(&dn->dn_mtx);
--				return (B_TRUE);
--			}
--		}
--		if (dn->dn_free_ranges[i] != NULL) {
-+		if (multilist_link_active(&dn->dn_dirty_link[i])) {
- 			mutex_exit(&dn->dn_mtx);
- 			return (B_TRUE);
- 		}
- 	}
-+
- 	mutex_exit(&dn->dn_mtx);
- 
- 	return (B_FALSE);
-@@ -2667,9 +2658,7 @@ dnode_next_offset(dnode_t *dn, int flags, uint64_t *offset,
- 		rw_enter(&dn->dn_struct_rwlock, RW_READER);
- 
- 	if (dn->dn_phys->dn_nlevels == 0) {
--		if (!(flags & DNODE_FIND_HOLE)) {
--			error = SET_ERROR(ESRCH);
--		}
-+		error = SET_ERROR(ESRCH);
- 		goto out;
- 	}
- 
--- 
-2.40.0
-
diff --git a/sys-fs/zfs-kmod/files/2.1.7-ppc64-ieee128-compat.patch b/sys-fs/zfs-kmod/files/2.1.7-ppc64-ieee128-compat.patch
deleted file mode 100644
index 5613cb8ca9d1..000000000000
--- a/sys-fs/zfs-kmod/files/2.1.7-ppc64-ieee128-compat.patch
+++ /dev/null
@@ -1,217 +0,0 @@
-From 8324d738fdb3096bd97336476bb399e6c312289a Mon Sep 17 00:00:00 2001
-From: Richard Yao <richard.yao@alumni.stonybrook.edu>
-Date: Thu, 12 Jan 2023 11:06:57 -0500
-Subject: [PATCH] Linux ppc64le ieee128 compat: Do not redefine __asm on
- external headers
-
-There is an external assembly declaration extension in GNU C that glibc
-uses when building with ieee128 floating point support on ppc64le.
-Marking that as volatile makes no sense, so the build breaks.
-
-It does not make sense to only mark this as volatile on Linux, since if
-do not want the compiler reordering things on Linux, we do not want the
-compiler reordering things on any other platform, so we stop treating
-Linux specially and just manually inline the CPP macro so that we can
-eliminate it. This should fix the build on ppc64le.
-
-Closes openzfs/zfs#14308
-Signed-off-by: Richard Yao <richard.yao@alumni.stonybrook.edu>
----
- .../vdev_raidz_math_powerpc_altivec_common.h  | 44 +++++++++----------
- 1 file changed, 20 insertions(+), 24 deletions(-)
-
-diff --git a/module/zfs/vdev_raidz_math_powerpc_altivec_common.h b/module/zfs/vdev_raidz_math_powerpc_altivec_common.h
-index 46d42c5e241..f76eb47a9c6 100644
---- a/module/zfs/vdev_raidz_math_powerpc_altivec_common.h
-+++ b/module/zfs/vdev_raidz_math_powerpc_altivec_common.h
-@@ -26,10 +26,6 @@
- #include <sys/types.h>
- #include <sys/simd.h>
- 
--#ifdef __linux__
--#define	__asm __asm__ __volatile__
--#endif
--
- #define	_REG_CNT(_0, _1, _2, _3, _4, _5, _6, _7, N, ...) N
- #define	REG_CNT(r...) _REG_CNT(r, 8, 7, 6, 5, 4, 3, 2, 1)
- 
-@@ -142,7 +138,7 @@ typedef struct v {
- {								\
- 	switch (REG_CNT(r)) {					\
- 	case 8:							\
--		__asm(						\
-+		__asm__ __volatile__(				\
- 		"lvx 21,0,%[SRC0]\n"				\
- 		"lvx 20,0,%[SRC1]\n"				\
- 		"lvx 19,0,%[SRC2]\n"				\
-@@ -172,7 +168,7 @@ typedef struct v {
- 		:	"v18", "v19", "v20", "v21");		\
- 		break;						\
- 	case 4:							\
--		__asm(						\
-+		__asm__ __volatile__(				\
- 		"lvx 21,0,%[SRC0]\n"				\
- 		"lvx 20,0,%[SRC1]\n"				\
- 		"lvx 19,0,%[SRC2]\n"				\
-@@ -189,7 +185,7 @@ typedef struct v {
- 		:	"v18", "v19", "v20", "v21");		\
- 		break;						\
- 	case 2:							\
--		__asm(						\
-+		__asm__ __volatile__(				\
- 		"lvx 21,0,%[SRC0]\n"				\
- 		"lvx 20,0,%[SRC1]\n"				\
- 		"vxor " VR0(r) "," VR0(r) ",21\n"		\
-@@ -208,7 +204,7 @@ typedef struct v {
- {								\
- 	switch (REG_CNT(r)) {					\
- 	case 8:							\
--		__asm(						\
-+		__asm__ __volatile__(				\
- 		"vxor " VR4(r) "," VR4(r) "," VR0(r) "\n"	\
- 		"vxor " VR5(r) "," VR5(r) "," VR1(r) "\n"	\
- 		"vxor " VR6(r) "," VR6(r) "," VR2(r) "\n"	\
-@@ -217,7 +213,7 @@ typedef struct v {
- 		:	RVR0(r), RVR1(r), RVR2(r), RVR3(r));	\
- 		break;						\
- 	case 4:							\
--		__asm(						\
-+		__asm__ __volatile__(				\
- 		"vxor " VR2(r) "," VR2(r) "," VR0(r) "\n"	\
- 		"vxor " VR3(r) "," VR3(r) "," VR1(r) "\n"	\
- 		:	UVR2(r), UVR3(r)			\
-@@ -232,7 +228,7 @@ typedef struct v {
- {								\
- 	switch (REG_CNT(r)) {					\
- 	case 8:							\
--		__asm(						\
-+		__asm__ __volatile__(				\
- 		"vxor " VR0(r) "," VR0(r) "," VR0(r) "\n"	\
- 		"vxor " VR1(r) "," VR1(r) "," VR1(r) "\n"	\
- 		"vxor " VR2(r) "," VR2(r) "," VR2(r) "\n"	\
-@@ -245,7 +241,7 @@ typedef struct v {
- 			WVR4(r), WVR5(r), WVR6(r), WVR7(r));	\
- 		break;						\
- 	case 4:							\
--		__asm(						\
-+		__asm__ __volatile__(				\
- 		"vxor " VR0(r) "," VR0(r) "," VR0(r) "\n"	\
- 		"vxor " VR1(r) "," VR1(r) "," VR1(r) "\n"	\
- 		"vxor " VR2(r) "," VR2(r) "," VR2(r) "\n"	\
-@@ -253,7 +249,7 @@ typedef struct v {
- 		:	WVR0(r), WVR1(r), WVR2(r), WVR3(r));	\
- 		break;						\
- 	case 2:							\
--		__asm(						\
-+		__asm__ __volatile__(				\
- 		"vxor " VR0(r) "," VR0(r) "," VR0(r) "\n"	\
- 		"vxor " VR1(r) "," VR1(r) "," VR1(r) "\n"	\
- 		:	WVR0(r), WVR1(r));			\
-@@ -267,7 +263,7 @@ typedef struct v {
- {								\
- 	switch (REG_CNT(r)) {					\
- 	case 8:							\
--		__asm(						\
-+		__asm__ __volatile__(				\
- 		"vor " VR4(r) "," VR0(r) "," VR0(r) "\n"	\
- 		"vor " VR5(r) "," VR1(r) "," VR1(r) "\n"	\
- 		"vor " VR6(r) "," VR2(r) "," VR2(r) "\n"	\
-@@ -276,7 +272,7 @@ typedef struct v {
- 		:	RVR0(r), RVR1(r), RVR2(r), RVR3(r));	\
- 		break;						\
- 	case 4:							\
--		__asm(						\
-+		__asm__ __volatile__(				\
- 		"vor " VR2(r) "," VR0(r) "," VR0(r) "\n"	\
- 		"vor " VR3(r) "," VR1(r) "," VR1(r) "\n"	\
- 		:	WVR2(r), WVR3(r)			\
-@@ -291,7 +287,7 @@ typedef struct v {
- {								\
- 	switch (REG_CNT(r)) {					\
- 	case 8:							\
--		__asm(						\
-+		__asm__ __volatile__(				\
- 		"lvx " VR0(r) " ,0,%[SRC0]\n"			\
- 		"lvx " VR1(r) " ,0,%[SRC1]\n"			\
- 		"lvx " VR2(r) " ,0,%[SRC2]\n"			\
-@@ -312,7 +308,7 @@ typedef struct v {
- 		[SRC7] "r" ((OFFSET(src, 112))));		\
- 		break;						\
- 	case 4:							\
--		__asm(						\
-+		__asm__ __volatile__(				\
- 		"lvx " VR0(r) " ,0,%[SRC0]\n"			\
- 		"lvx " VR1(r) " ,0,%[SRC1]\n"			\
- 		"lvx " VR2(r) " ,0,%[SRC2]\n"			\
-@@ -324,7 +320,7 @@ typedef struct v {
- 		[SRC3] "r" ((OFFSET(src, 48))));		\
- 		break;						\
- 	case 2:							\
--		__asm(						\
-+		__asm__ __volatile__(				\
- 		"lvx " VR0(r) " ,0,%[SRC0]\n"			\
- 		"lvx " VR1(r) " ,0,%[SRC1]\n"			\
- 		:	WVR0(r), WVR1(r)			\
-@@ -340,7 +336,7 @@ typedef struct v {
- {								\
- 	switch (REG_CNT(r)) {					\
- 	case 8:							\
--		__asm(						\
-+		__asm__ __volatile__(				\
- 		"stvx " VR0(r) " ,0,%[DST0]\n"			\
- 		"stvx " VR1(r) " ,0,%[DST1]\n"			\
- 		"stvx " VR2(r) " ,0,%[DST2]\n"			\
-@@ -362,7 +358,7 @@ typedef struct v {
- 		:	"memory");				\
- 		break;						\
- 	case 4:							\
--		__asm(						\
-+		__asm__ __volatile__(				\
- 		"stvx " VR0(r) " ,0,%[DST0]\n"			\
- 		"stvx " VR1(r) " ,0,%[DST1]\n"			\
- 		"stvx " VR2(r) " ,0,%[DST2]\n"			\
-@@ -375,7 +371,7 @@ typedef struct v {
- 		: "memory");					\
- 		break;						\
- 	case 2:							\
--		__asm(						\
-+		__asm__ __volatile__(				\
- 		"stvx " VR0(r) " ,0,%[DST0]\n"			\
- 		"stvx " VR1(r) " ,0,%[DST1]\n"			\
- 		: :	[DST0] "r" ((OFFSET(dst, 0))),		\
-@@ -400,7 +396,7 @@ typedef struct v {
- 
- #define	MUL2_SETUP()						\
- {								\
--	__asm(							\
-+	__asm__ __volatile__(					\
- 		"vspltisb " VR(16) ",14\n"			\
- 		"vspltisb " VR(17) ",15\n"			\
- 		"vaddubm " VR(16) "," VR(17) "," VR(16) "\n"	\
-@@ -412,7 +408,7 @@ typedef struct v {
- {								\
- 	switch (REG_CNT(r)) {					\
- 	case 4:							\
--		__asm(						\
-+		__asm__ __volatile__(				\
- 		"vcmpgtsb 19," VR(17) "," VR0(r) "\n"		\
- 		"vcmpgtsb 18," VR(17) "," VR1(r) "\n"		\
- 		"vcmpgtsb 21," VR(17) "," VR2(r) "\n"		\
-@@ -434,7 +430,7 @@ typedef struct v {
- 		:	"v18", "v19", "v20", "v21");		\
- 		break;						\
- 	case 2:							\
--		__asm(						\
-+		__asm__ __volatile__(				\
- 		"vcmpgtsb 19," VR(17) "," VR0(r) "\n"		\
- 		"vcmpgtsb 18," VR(17) "," VR1(r) "\n"		\
- 		"vand 19,19," VR(16) "\n"			\
-@@ -478,7 +474,7 @@ typedef struct v {
- {								\
- 	switch (REG_CNT(r)) {					\
- 	case 2:							\
--		__asm(						\
-+		__asm__ __volatile__(				\
- 		/* lts for upper part */			\
- 		"vspltisb 15,15\n"				\
- 		"lvx 10,0,%[lt0]\n"				\
diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.1.10-r1.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.1.10-r1.ebuild
deleted file mode 100644
index bd0070f85ad1..000000000000
--- a/sys-fs/zfs-kmod/zfs-kmod-2.1.10-r1.ebuild
+++ /dev/null
@@ -1,217 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools dist-kernel-utils flag-o-matic linux-mod toolchain-funcs
-
-DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs"
-HOMEPAGE="https://github.com/openzfs/zfs"
-
-if [[ ${PV} == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/openzfs/zfs.git"
-else
-	VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/openzfs.asc
-	inherit verify-sig
-
-	MY_PV="${PV/_rc/-rc}"
-	SRC_URI="https://github.com/openzfs/zfs/releases/download/zfs-${MY_PV}/zfs-${MY_PV}.tar.gz"
-	SRC_URI+=" verify-sig? ( https://github.com/openzfs/zfs/releases/download/zfs-${MY_PV}/zfs-${MY_PV}.tar.gz.asc )"
-	S="${WORKDIR}/zfs-${PV%_rc?}"
-	ZFS_KERNEL_COMPAT="6.2"
-
-	# increments minor eg 5.14 -> 5.15, and still supports override.
-	ZFS_KERNEL_DEP="${ZFS_KERNEL_COMPAT_OVERRIDE:-${ZFS_KERNEL_COMPAT}}"
-	ZFS_KERNEL_DEP="${ZFS_KERNEL_DEP%%.*}.$(( ${ZFS_KERNEL_DEP##*.} + 1))"
-
-	if [[ ${PV} != *_rc* ]]; then
-		KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~sparc"
-	fi
-fi
-
-LICENSE="CDDL MIT debug? ( GPL-2+ )"
-SLOT="0/${PVR}"
-IUSE="custom-cflags debug +rootfs"
-
-RDEPEND="${DEPEND}"
-
-BDEPEND="
-	dev-lang/perl
-	app-alternatives/awk
-"
-
-# we want dist-kernel block in BDEPEND because of portage resolver.
-# since linux-mod.eclass already sets version-unbounded dep, portage
-# will pull new versions. So we set it in BDEPEND which takes priority.
-# and we don't need in in git ebuild.
-if [[ ${PV} != "9999" ]] ; then
-	BDEPEND+="
-		verify-sig? ( sec-keys/openpgp-keys-openzfs )
-		dist-kernel? ( <virtual/dist-kernel-${ZFS_KERNEL_DEP}:= )
-	"
-fi
-
-# PDEPEND in this form is needed to trick portage suggest
-# enabling dist-kernel if only 1 package have it set
-PDEPEND="dist-kernel? ( ~sys-fs/zfs-${PV}[dist-kernel] )"
-
-RESTRICT="debug? ( strip ) test"
-
-DOCS=( AUTHORS COPYRIGHT META README.md )
-
-PATCHES=(
-	# https://github.com/openzfs/zfs/issues/14753
-	"${FILESDIR}"/2.1.10-Revert-ZFS_IOC_COUNT_FILLED-does-unnecessary-txg_wai.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
-}
-
-pkg_setup() {
-	CONFIG_CHECK="
-		!DEBUG_LOCK_ALLOC
-		EFI_PARTITION
-		MODULES
-		!PAX_KERNEXEC_PLUGIN_METHOD_OR
-		!TRIM_UNUSED_KSYMS
-		ZLIB_DEFLATE
-		ZLIB_INFLATE
-	"
-
-	use debug && CONFIG_CHECK="${CONFIG_CHECK}
-		FRAME_POINTER
-		DEBUG_INFO
-		!DEBUG_INFO_REDUCED
-	"
-
-	use rootfs && \
-		CONFIG_CHECK="${CONFIG_CHECK}
-			BLK_DEV_INITRD
-			DEVTMPFS
-	"
-
-	kernel_is -lt 5 && CONFIG_CHECK="${CONFIG_CHECK} IOSCHED_NOOP"
-
-	if [[ ${PV} != "9999" ]]; then
-		local kv_major_max kv_minor_max zcompat
-		zcompat="${ZFS_KERNEL_COMPAT_OVERRIDE:-${ZFS_KERNEL_COMPAT}}"
-		kv_major_max="${zcompat%%.*}"
-		zcompat="${zcompat#*.}"
-		kv_minor_max="${zcompat%%.*}"
-		kernel_is -le "${kv_major_max}" "${kv_minor_max}" || die \
-			"Linux ${kv_major_max}.${kv_minor_max} is the latest supported version"
-
-	fi
-
-	kernel_is -ge 3 10 || die "Linux 3.10 or newer required"
-
-	linux-mod_pkg_setup
-}
-
-src_unpack() {
-	if use verify-sig ; then
-		# Needed for downloaded patch (which is unsigned, which is fine)
-		verify-sig_verify_detached "${DISTDIR}"/zfs-${MY_PV}.tar.gz{,.asc}
-	fi
-
-	default
-}
-
-src_prepare() {
-	default
-
-	# Run unconditionally (bug #792627)
-	eautoreconf
-
-	if [[ ${PV} != "9999" ]]; then
-		# Set module revision number
-		sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" META || die "Could not set Gentoo release"
-	fi
-}
-
-src_configure() {
-	set_arch_to_kernel
-
-	use custom-cflags || strip-flags
-
-	filter-ldflags -Wl,*
-
-	# Set CROSS_COMPILE in the environment.
-	# This allows the user to override it via make.conf or via a local Makefile.
-	# https://bugs.gentoo.org/811600
-	export CROSS_COMPILE=${CROSS_COMPILE-${CHOST}-}
-
-	local myconf=(
-		HOSTCC="$(tc-getBUILD_CC)"
-		--bindir="${EPREFIX}/bin"
-		--sbindir="${EPREFIX}/sbin"
-		--with-config=kernel
-		--with-linux="${KV_DIR}"
-		--with-linux-obj="${KV_OUT_DIR}"
-		$(use_enable debug)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	set_arch_to_kernel
-
-	myemakeargs=(
-		HOSTCC="$(tc-getBUILD_CC)"
-		V=1
-	)
-
-	emake "${myemakeargs[@]}"
-}
-
-src_install() {
-	set_arch_to_kernel
-
-	myemakeargs+=(
-		DEPMOD=:
-		# INSTALL_MOD_PATH ?= $(DESTDIR) in module/Makefile
-		DESTDIR="${D}"
-	)
-
-	emake "${myemakeargs[@]}" install
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	if [[ -z ${ROOT} ]] && use dist-kernel; then
-		set_arch_to_pkgmgr
-		dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}"
-	fi
-
-	if use x86 || use arm; then
-		ewarn "32-bit kernels will likely require increasing vmalloc to"
-		ewarn "at least 256M and decreasing zfs_arc_max to some value less than that."
-	fi
-
-	if has_version sys-boot/grub; then
-		ewarn "This version of OpenZFS includes support for new feature flags"
-		ewarn "that are incompatible with previous versions. GRUB2 support for"
-		ewarn "/boot with the new feature flags is not yet available."
-		ewarn "Do *NOT* upgrade root pools to use the new feature flags."
-		ewarn "Any new pools will be created with the new feature flags by default"
-		ewarn "and will not be compatible with older versions of OpenZFS. To"
-		ewarn "create a new pool that is backward compatible wih GRUB2, use "
-		ewarn
-		ewarn "zpool create -o compatibility=grub2 ..."
-		ewarn
-		ewarn "Refer to /usr/share/zfs/compatibility.d/grub2 for list of features."
-	fi
-}
diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.1.7.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.1.7.ebuild
deleted file mode 100644
index 3f2082380eaf..000000000000
--- a/sys-fs/zfs-kmod/zfs-kmod-2.1.7.ebuild
+++ /dev/null
@@ -1,219 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools dist-kernel-utils flag-o-matic linux-mod toolchain-funcs
-
-DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs"
-HOMEPAGE="https://github.com/openzfs/zfs"
-
-if [[ ${PV} == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/openzfs/zfs.git"
-else
-	VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/openzfs.asc
-	inherit verify-sig
-
-	MY_PV="${PV/_rc/-rc}"
-	SRC_URI="https://github.com/openzfs/zfs/releases/download/zfs-${MY_PV}/zfs-${MY_PV}.tar.gz"
-	SRC_URI+=" verify-sig? ( https://github.com/openzfs/zfs/releases/download/zfs-${MY_PV}/zfs-${MY_PV}.tar.gz.asc )"
-	S="${WORKDIR}/zfs-${PV%_rc?}"
-	ZFS_KERNEL_COMPAT="6.0"
-
-	# increments minor eg 5.14 -> 5.15, and still supports override.
-	ZFS_KERNEL_DEP="${ZFS_KERNEL_COMPAT_OVERRIDE:-${ZFS_KERNEL_COMPAT}}"
-	ZFS_KERNEL_DEP="${ZFS_KERNEL_DEP%%.*}.$(( ${ZFS_KERNEL_DEP##*.} + 1))"
-
-	if [[ ${PV} != *_rc* ]]; then
-		KEYWORDS="amd64 arm64 ppc64 ~riscv ~sparc"
-	fi
-fi
-
-LICENSE="CDDL MIT debug? ( GPL-2+ )"
-SLOT="0/${PVR}"
-IUSE="custom-cflags debug +rootfs"
-
-RDEPEND="${DEPEND}"
-
-BDEPEND="
-	dev-lang/perl
-	app-alternatives/awk
-"
-
-# we want dist-kernel block in BDEPEND because of portage resolver.
-# since linux-mod.eclass already sets version-unbounded dep, portage
-# will pull new versions. So we set it in BDEPEND which takes priority.
-# and we don't need in in git ebuild.
-if [[ ${PV} != "9999" ]] ; then
-	BDEPEND+="
-		verify-sig? ( sec-keys/openpgp-keys-openzfs )
-		dist-kernel? ( <virtual/dist-kernel-${ZFS_KERNEL_DEP}:= )
-	"
-fi
-
-# PDEPEND in this form is needed to trick portage suggest
-# enabling dist-kernel if only 1 package have it set
-PDEPEND="dist-kernel? ( ~sys-fs/zfs-${PV}[dist-kernel] )"
-
-RESTRICT="debug? ( strip ) test"
-
-DOCS=( AUTHORS COPYRIGHT META README.md )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.1.6-fgrep.patch
-
-	# https://github.com/openzfs/zfs/issues/14308
-	"${FILESDIR}"/2.1.7-ppc64-ieee128-compat.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
-}
-
-pkg_setup() {
-	CONFIG_CHECK="
-		!DEBUG_LOCK_ALLOC
-		EFI_PARTITION
-		MODULES
-		!PAX_KERNEXEC_PLUGIN_METHOD_OR
-		!TRIM_UNUSED_KSYMS
-		ZLIB_DEFLATE
-		ZLIB_INFLATE
-	"
-
-	use debug && CONFIG_CHECK="${CONFIG_CHECK}
-		FRAME_POINTER
-		DEBUG_INFO
-		!DEBUG_INFO_REDUCED
-	"
-
-	use rootfs && \
-		CONFIG_CHECK="${CONFIG_CHECK}
-			BLK_DEV_INITRD
-			DEVTMPFS
-	"
-
-	kernel_is -lt 5 && CONFIG_CHECK="${CONFIG_CHECK} IOSCHED_NOOP"
-
-	if [[ ${PV} != "9999" ]]; then
-		local kv_major_max kv_minor_max zcompat
-		zcompat="${ZFS_KERNEL_COMPAT_OVERRIDE:-${ZFS_KERNEL_COMPAT}}"
-		kv_major_max="${zcompat%%.*}"
-		zcompat="${zcompat#*.}"
-		kv_minor_max="${zcompat%%.*}"
-		kernel_is -le "${kv_major_max}" "${kv_minor_max}" || die \
-			"Linux ${kv_major_max}.${kv_minor_max} is the latest supported version"
-
-	fi
-
-	kernel_is -ge 3 10 || die "Linux 3.10 or newer required"
-
-	linux-mod_pkg_setup
-}
-
-src_unpack() {
-	if use verify-sig ; then
-		# Needed for downloaded patch (which is unsigned, which is fine)
-		verify-sig_verify_detached "${DISTDIR}"/zfs-${MY_PV}.tar.gz{,.asc}
-	fi
-
-	default
-}
-
-src_prepare() {
-	default
-
-	# Run unconditionally (bug #792627)
-	eautoreconf
-
-	if [[ ${PV} != "9999" ]]; then
-		# Set module revision number
-		sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" META || die "Could not set Gentoo release"
-	fi
-}
-
-src_configure() {
-	set_arch_to_kernel
-
-	use custom-cflags || strip-flags
-
-	filter-ldflags -Wl,*
-
-	# Set CROSS_COMPILE in the environment.
-	# This allows the user to override it via make.conf or via a local Makefile.
-	# https://bugs.gentoo.org/811600
-	export CROSS_COMPILE=${CROSS_COMPILE-${CHOST}-}
-
-	local myconf=(
-		HOSTCC="$(tc-getBUILD_CC)"
-		--bindir="${EPREFIX}/bin"
-		--sbindir="${EPREFIX}/sbin"
-		--with-config=kernel
-		--with-linux="${KV_DIR}"
-		--with-linux-obj="${KV_OUT_DIR}"
-		$(use_enable debug)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	set_arch_to_kernel
-
-	myemakeargs=(
-		HOSTCC="$(tc-getBUILD_CC)"
-		V=1
-	)
-
-	emake "${myemakeargs[@]}"
-}
-
-src_install() {
-	set_arch_to_kernel
-
-	myemakeargs+=(
-		DEPMOD=:
-		# INSTALL_MOD_PATH ?= $(DESTDIR) in module/Makefile
-		DESTDIR="${D}"
-	)
-
-	emake "${myemakeargs[@]}" install
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	if [[ -z ${ROOT} ]] && use dist-kernel; then
-		set_arch_to_pkgmgr
-		dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}"
-	fi
-
-	if use x86 || use arm; then
-		ewarn "32-bit kernels will likely require increasing vmalloc to"
-		ewarn "at least 256M and decreasing zfs_arc_max to some value less than that."
-	fi
-
-	if has_version sys-boot/grub; then
-		ewarn "This version of OpenZFS includes support for new feature flags"
-		ewarn "that are incompatible with previous versions. GRUB2 support for"
-		ewarn "/boot with the new feature flags is not yet available."
-		ewarn "Do *NOT* upgrade root pools to use the new feature flags."
-		ewarn "Any new pools will be created with the new feature flags by default"
-		ewarn "and will not be compatible with older versions of OpenZFS. To"
-		ewarn "create a new pool that is backward compatible wih GRUB2, use "
-		ewarn
-		ewarn "zpool create -o compatibility=grub2 ..."
-		ewarn
-		ewarn "Refer to /usr/share/zfs/compatibility.d/grub2 for list of features."
-	fi
-}