14 files changed, 531 insertions, 167 deletions
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index bc24bbf36868..2ecbebf30413 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/mtools/Manifest b/sys-fs/mtools/Manifest
index cdbba269f0ef..bd190b54f830 100644
--- a/sys-fs/mtools/Manifest
+++ b/sys-fs/mtools/Manifest
@@ -6,6 +6,6 @@ DIST mtools-4.0.46.tar.lz 391300 BLAKE2B 997e766b215aebefb23d57f357ea0b95db62a7e
 EBUILD mtools-4.0.42.ebuild 1060 BLAKE2B d92adedc56a0e1546c388ec7131c11e2c9a14b5fee3fd9d30be1da012d04479b440f56ed410ad598e020b85562ef18aba787e876ba380a05127fe9ae0cc1feef SHA512 a54c3be439cccb4393e965be0f50b23608f338ae611d2f6d3a4b411032638318f178b05198623c8bab2d537ccda40bfac4ac70d4d48353b3ed0409b61384047e
 EBUILD mtools-4.0.43.ebuild 1060 BLAKE2B f26d54fc0f2584f27560d2160efc8d527a70ecd317727adfb051e04bd20bd53ef32568ad96e3a8420256f1416d6c2b52203a5830d25c09bb267cbe58968b3c8c SHA512 852d8572c2f89299ee51e8608ef1d0f500bdc4308fd6d637f3ba4201034158b5c1266b5eab7e64d4e9a9b01845bea1b68327606333d265f86012e7618f8b2304
 EBUILD mtools-4.0.44.ebuild 1106 BLAKE2B 19e50766eebc08fe10b45f1ebabce0cc3b5b9e1e640ab12462c0b41acb3a7f95467447c07bcff1a414700c22ae69ee9d8258e68944e6f5a89e88a4501b359fe7 SHA512 ee30772edcbc8df7a5595b9408bfcb9b48f67adc8f74f20061427d4df6e23a2ddadc54e1b46d61b758ad33708421ef8092aacebe5f31124133a43939282a2af3
-EBUILD mtools-4.0.45.ebuild 1113 BLAKE2B 1d6a108b730fdcb212050a7dfc7a0923d10bf97d540168c11d2f394b80ccf0a1f0f513db678a45120476585976b2cd873d67cb50bab482b6b342d1b09038763f SHA512 2e822b7900b123495c307de3c012925e919fffdbc0af7006dd5fccfe7b1644a144ab4ed8325fce22b1e79c8e8a09ba6604574368e4db5b2b9d8d7237e138ab03
+EBUILD mtools-4.0.45.ebuild 1108 BLAKE2B 0dc70a3aa08c5f3210cfc22f83b619320190a5c118f267a9e70113a54da941c12e3ad3e51962a9306a378decb85f81c6e943e1ca26cdd689e66eaa3e71c0302e SHA512 ab6cec6928c989f9cb39d7196ef62575258508747494351954b5497244c08e881c8bc225bc5ef60be400dfe9224f000dbf22e0ae10cf23df0cacc10f04848643
 EBUILD mtools-4.0.46.ebuild 1113 BLAKE2B 1d6a108b730fdcb212050a7dfc7a0923d10bf97d540168c11d2f394b80ccf0a1f0f513db678a45120476585976b2cd873d67cb50bab482b6b342d1b09038763f SHA512 2e822b7900b123495c307de3c012925e919fffdbc0af7006dd5fccfe7b1644a144ab4ed8325fce22b1e79c8e8a09ba6604574368e4db5b2b9d8d7237e138ab03
 MISC metadata.xml 375 BLAKE2B 7b9f85cb5e60ac6716012455042af65e14007d0b913842352098db7a79256b07096b51645ad294dad1d3be6f7acd3aa05bf52985a0cafce9faa78bde4de0a073 SHA512 827ce3643138e41a4ab9b652e16035bfa9e9a0714e69e979841feca48231d4bdbd37252e1d3aa2b5c4753e38215eadc58f8e43c00914ec9888d66078ea5f91c4
diff --git a/sys-fs/mtools/mtools-4.0.45.ebuild b/sys-fs/mtools/mtools-4.0.45.ebuild
index 95a421fafd18..e8cbd70debcd 100644
--- a/sys-fs/mtools/mtools-4.0.45.ebuild
+++ b/sys-fs/mtools/mtools-4.0.45.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.lz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~loong ppc ~ppc64 ~riscv sparc x86 ~x64-macos ~x64-solaris"
 IUSE="gui"
 
 RDEPEND="
diff --git a/sys-fs/udiskie/Manifest b/sys-fs/udiskie/Manifest
index a0c2172c626f..529ae7f99c9d 100644
--- a/sys-fs/udiskie/Manifest
+++ b/sys-fs/udiskie/Manifest
@@ -1,11 +1,5 @@
-DIST udiskie-2.4.2.tar.gz 95178 BLAKE2B eec6f4d2aed9ad86400ee8f3924a8b748cbb1e7ccc1aa2b681858065c18d172def5cc32763a7c2af0899fd719b53bf08d6fddbeb2611cfa74d5b968da0a756b9 SHA512 0881872c614f73b034835f6157eae7f944b6f4ea08a5dabaeb1e6a476a620720dfe950e538a03a3cbdd2a54e95f64a5349650decd554930d02086fdac2e45f23
-DIST udiskie-2.5.0.tar.gz 98570 BLAKE2B 0b07c4135a5ef199f6e84c7d341a355148926c27145e0dcc98baeb891415bb6a18f9395b3feff476b19593bb70951d07fd53ac0ea175dee2c8bdcd861b783613 SHA512 e9c367449f7b3e1b1d4fcdb98e5fb29a198010e6219bcd094e57c17aa063fc8e53ab56738f7b55fb039880c4bc2e42d846be63201c6c25936fb0715443382f26
-DIST udiskie-2.5.1.tar.gz 100289 BLAKE2B 4e1b3a2b6733cf0586039c362a3f2345b1b0563760267651ea9a1c888aaf252e3eb5ef5abffbdaa4ea03ccce5134a6b888709a0382715dad1cc91ec86f08d0b1 SHA512 f5f38de01ac02e92edc06f37a2c97bc0029fa439d0bd4b1a45584de62634fa9fde7ccdede06284230d6b5c8aa9ecfad20d029ebb432d07b6d23a5a887ba5de02
-DIST udiskie-2.5.2.tar.gz 100640 BLAKE2B b9160bd8f74e979ad3f19cabab6daf8fb61f0e7dfea32eb3d226b30df9a31ca014682e1c84e5111fffca7938f83857fa06611dede086ed62d75a06ce619ff5b3 SHA512 94dcbe22d41b2f5b2960d7f710f773aca19404108f7699248b4a0896e704aa1392d3e865cd4e0f52f9c21925d4bc4631cacb559e5b35035a247206132ba0f962
 DIST udiskie-2.5.3.tar.gz 101050 BLAKE2B c6a15a64ca294155a0ad3f1f5bc9fdec5f46b7461f91cd51f7863f87636996abbfbc4ca0a725474b651992e204f46d46eb3f53ce4175e7c97c01d1877613f91b SHA512 16de6f9a6eb3c780704f5030ae2d100db28bc77cce144cc0aa69b8d12ecc8bbf7b942dc57ecc53c6e3e44cb950f7f76b18cb1b78a19e156de43373b9070bf4da
-EBUILD udiskie-2.4.2-r2.ebuild 1111 BLAKE2B 2cef3f18c3eb97ad3f14dd4ece9ea21577a3b6bd3bc646a0e95c29a6e5de1eab9d6cf63931b3ec46c339a3bfab4424877dcf14985a701e4ec5e718f6457722ff SHA512 8a427c4280026d59b02abc2dc110b085d774abbd92f8c8e59c3e78cb7a15ca8c3d485b332d98354d596362a9932a67638cbbbecb1983cb9e491dbf5d013173be
-EBUILD udiskie-2.5.0-r1.ebuild 1113 BLAKE2B 43431f40c443ec2e0e69bf627dcf17443f30ec8835a6be9814e591aa718a21be9dc4e2f47958d0b8025f734421357076b011d62359f1cf39d09c747f1e8f1fb2 SHA512 588223f262e4bf2ac95f74a07cf8bf75a9af6484e759d9e4e698c6aa55d8f3b69fbfa67b2374cc89ce8a0461fb4bbd1ddcf25c2c3702d161ed2e79a22a1a3b1e
-EBUILD udiskie-2.5.1.ebuild 1113 BLAKE2B 43431f40c443ec2e0e69bf627dcf17443f30ec8835a6be9814e591aa718a21be9dc4e2f47958d0b8025f734421357076b011d62359f1cf39d09c747f1e8f1fb2 SHA512 588223f262e4bf2ac95f74a07cf8bf75a9af6484e759d9e4e698c6aa55d8f3b69fbfa67b2374cc89ce8a0461fb4bbd1ddcf25c2c3702d161ed2e79a22a1a3b1e
-EBUILD udiskie-2.5.2.ebuild 1149 BLAKE2B 4d4a0aed3214eb7ca7c679b3e13aef080edbbfff7456f0231e49d2026a09cbbbf31b78753f368d7a86f3a0fdd52180fa20e530ea8c22bab3b6992794f624372b SHA512 dd57ace8094cbacd0de8a5155979c0e569e6a358edfe2c5b7b8ccafdd7dfb41fe071c9fd38acef9a8bd3efa48ecaaadc7d25609067b1eb8f9e434a127de44473
+DIST udiskie-2.5.7.tar.gz 103275 BLAKE2B d709afa031a42c367e31a7ad54d7f4d8ad769d6232a93ce64b15ef2977326743e954a8f4dab60274f55db687add1e31c9cc83e81c9ab69dee6ffeeb445afe05b SHA512 62bc7ba78359c372d6cda9c33702864833b71f53df57e7433c3dcc8169b3f3bd7740d58ff6a4bcb1fcd8f5dd4eb5235bf87c8f1747de2a4a4fa20699d4242d35
 EBUILD udiskie-2.5.3.ebuild 1149 BLAKE2B 0b18fe8747f769ecfcd3da3eda8d5c4cc90c6ddabdb029bd627ad07cdadc4af8e290e4ae2b4cfc9afe336cb9f19999e32e6b8e1b5ae1a2063dea17e873a01a6f SHA512 ca99ee1e93dfb62b260986dfbcac0ee1d715118afe431f8a2bcc58272f1356c242388ecbaaf51f5d76eee0a20dbffd3f3b82b45d567d6d2f3793881311aacabd
+EBUILD udiskie-2.5.7.ebuild 1151 BLAKE2B c58d6bac6926adf1cc1c5b9f7bac91e931357e84e115de25193bb65109511456d00fcf8511de6e6a15ddad72c2318e71e4f8d825e21b908a334879f235454b1c SHA512 cd3c4f4e3660571232e87f3dc3df99d30daa881392152fbcb48f369523d3b0039555542c0a967c6345de3c865119b07b953c8e53597c8fe431c4520df1fc47d4
 MISC metadata.xml 370 BLAKE2B d5b749c5ab2cf4ddd7c4df39045f109acaba44b50e8babeae6e3ad31e730a52e52bdce7922780a1f358e1a9e1f11d32882eef0f2ceb20ef04011301b7fd3ff83 SHA512 9fd25405737377b4fe0a38672bb3ec871d6d099dcd8b7cfb0bac631a7407133f5974b4d43751dcc186e48dc27997388da30350608139166351a390bc8d02de39
diff --git a/sys-fs/udiskie/udiskie-2.4.2-r2.ebuild b/sys-fs/udiskie/udiskie-2.4.2-r2.ebuild
deleted file mode 100644
index fd9626a54410..000000000000
--- a/sys-fs/udiskie/udiskie-2.4.2-r2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{9..11} )
-DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1 pypi xdg-utils
-
-DESCRIPTION="An automatic disk mounting service using udisks"
-HOMEPAGE="https://pypi.org/project/udiskie/ https://github.com/coldfix/udiskie"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="libnotify"
-
-RDEPEND="dev-python/docopt[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	sys-fs/udisks:2
-	libnotify? ( x11-libs/libnotify[introspection] )"
-DEPEND="app-text/asciidoc
-	test? ( dev-python/keyutils[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e 's:gtk-update-icon-cache:true:' setup.py || die
-	sed -i -e 's: HACKING.rst, TRANSLATIONS.rst,::'	setup.cfg || die
-	default
-
-	distutils-r1_src_prepare
-}
-
-src_compile() {
-	distutils-r1_src_compile
-	emake -C doc
-}
-
-src_install() {
-	distutils-r1_src_install
-	doman doc/${PN}.8
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/sys-fs/udiskie/udiskie-2.5.0-r1.ebuild b/sys-fs/udiskie/udiskie-2.5.0-r1.ebuild
deleted file mode 100644
index 127a7ed4850d..000000000000
--- a/sys-fs/udiskie/udiskie-2.5.0-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{9..11} )
-DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1 pypi xdg-utils
-
-DESCRIPTION="An automatic disk mounting service using udisks"
-HOMEPAGE="https://pypi.org/project/udiskie/ https://github.com/coldfix/udiskie"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="libnotify"
-
-RDEPEND="dev-python/docopt[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	sys-fs/udisks:2
-	libnotify? ( x11-libs/libnotify[introspection] )"
-DEPEND="app-text/asciidoc
-	test? ( dev-python/keyutils[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e 's:gtk-update-icon-cache:true:' setup.py || die
-	sed -i -e 's: HACKING.rst, TRANSLATIONS.rst,::'	setup.cfg || die
-	default
-
-	distutils-r1_src_prepare
-}
-
-src_compile() {
-	distutils-r1_src_compile
-	emake -C doc
-}
-
-src_install() {
-	distutils-r1_src_install
-	doman doc/${PN}.8
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/sys-fs/udiskie/udiskie-2.5.1.ebuild b/sys-fs/udiskie/udiskie-2.5.1.ebuild
deleted file mode 100644
index 127a7ed4850d..000000000000
--- a/sys-fs/udiskie/udiskie-2.5.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{9..11} )
-DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1 pypi xdg-utils
-
-DESCRIPTION="An automatic disk mounting service using udisks"
-HOMEPAGE="https://pypi.org/project/udiskie/ https://github.com/coldfix/udiskie"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="libnotify"
-
-RDEPEND="dev-python/docopt[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	sys-fs/udisks:2
-	libnotify? ( x11-libs/libnotify[introspection] )"
-DEPEND="app-text/asciidoc
-	test? ( dev-python/keyutils[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e 's:gtk-update-icon-cache:true:' setup.py || die
-	sed -i -e 's: HACKING.rst, TRANSLATIONS.rst,::'	setup.cfg || die
-	default
-
-	distutils-r1_src_prepare
-}
-
-src_compile() {
-	distutils-r1_src_compile
-	emake -C doc
-}
-
-src_install() {
-	distutils-r1_src_install
-	doman doc/${PN}.8
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/sys-fs/udiskie/udiskie-2.5.2.ebuild b/sys-fs/udiskie/udiskie-2.5.7.ebuild
index 891647b54371..64df129d091a 100644
--- a/sys-fs/udiskie/udiskie-2.5.2.ebuild
+++ b/sys-fs/udiskie/udiskie-2.5.7.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{9..12} )
 DISTUTILS_USE_PEP517=setuptools
 inherit distutils-r1 pypi xdg-utils
 
@@ -11,7 +11,7 @@ HOMEPAGE="https://pypi.org/project/udiskie/ https://github.com/coldfix/udiskie"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE="libnotify"
 
 RDEPEND="dev-python/docopt[${PYTHON_USEDEP}]
diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest
index 429223b22783..8140789048c6 100644
--- a/sys-fs/xfsprogs/Manifest
+++ b/sys-fs/xfsprogs/Manifest
@@ -8,7 +8,7 @@ DIST xfsprogs-6.8.0.tar.xz 1367196 BLAKE2B 8c296698da1170bb7ff369c2bf5f156e812dd
 DIST xfsprogs-6.9.0.tar.xz 1383116 BLAKE2B d952603716cc4022a935c426630b0b7838573476a730c6832f36ef0274a640e64667d3e3a2dd9fd2c5f2c12cdb348fd93abfef5c49e5c5fe2d5a83945dfc7894 SHA512 c597453759c400690810971f0b2daf0e4e22c74270b0f9800e2235da5e5c1383b59bc1176c5bba0023f74b623020fb51c62f0e98a74885cf3a8336e0b81c9023
 EBUILD xfsprogs-6.10.0-r2.ebuild 2859 BLAKE2B 527366c51df7a215fce8b0e7d2d366e6d587dc37b86b379488aaa31e668eb495af757af8baf6d436a2ef760affd6fe7b2d47afe8a6088f5b6d130c9cbc098cd0 SHA512 9b8d76a07e4d5ffb26453b58f18f8739d95d4e9c3f6ff89d9e7222fbd7aa261570c63b7f1af49a5e001bc337c7e90ec2fca019ef429eae0bd617f82d25d8040c
 EBUILD xfsprogs-6.10.1.ebuild 2795 BLAKE2B 03fad313fe94ab824066c2d7c3a9d0f02d8cf1833b21fc3f71bb38a0802c145f2ce11e7ac2745ea298a88cf487d0b5d86eeb4cd0a010bf4e4e05029e1f45157a SHA512 ec1698750ee990598979bfb3fd6e662590c546560317043772d564fbb048ec6d11ea8e29b92d1c744b02bf2833c08ce4c59bc445e6d04d03a0b43ad21c407291
-EBUILD xfsprogs-6.11.0.ebuild 2921 BLAKE2B d471a2cbdf45e6c68384f8d8a4f03305a9c01fa3cc5cd7a01025f73468cc254d4e0c202157b3042e85f04f9e8af329377c27943ad9eff3c71a94857212f4561e SHA512 188ea919cff548c31e7f57f41b13e93d88ee56f7d2d00bd5e122a445a11afc72caedcb290c361187659693bc91f4fadec2535dee0c3a8fa58ad8994b51929233
+EBUILD xfsprogs-6.11.0.ebuild 2916 BLAKE2B e16f095fe51636b47d2bc709737ca1dcaf3c5cd8f6064f3fb246145dce4b44e168eb3139801fbe0ee2d4fd5dfb4a645a8c3fd3f467a593267baa9ffe995e63d0 SHA512 14b03231e6c400c0c9bb9141e98ccce046ee6aa466618611a094a41a6f199bd7a61daccaa5962664d7755fd4538d0da7b1e2acf69f3623b212face3649959459
 EBUILD xfsprogs-6.12.0.ebuild 2921 BLAKE2B d471a2cbdf45e6c68384f8d8a4f03305a9c01fa3cc5cd7a01025f73468cc254d4e0c202157b3042e85f04f9e8af329377c27943ad9eff3c71a94857212f4561e SHA512 188ea919cff548c31e7f57f41b13e93d88ee56f7d2d00bd5e122a445a11afc72caedcb290c361187659693bc91f4fadec2535dee0c3a8fa58ad8994b51929233
 EBUILD xfsprogs-6.8.0.ebuild 2589 BLAKE2B 724a51c203639b6ef3a1e60e04705ca46084acf58c59bed0ae8615fdfe60b8ba473092eb33b72b1276ca86b81a9dcdfcbda613a4c0643b061e1877ea139600d8 SHA512 9c2a1aadc1a5122e48768cbe60d6179c1e172960a92218767fcdf03adcf5a64b694798591c620e5045d131da61058a8651333607abe6ae237b607bddf8d1a5e7
 EBUILD xfsprogs-6.9.0.ebuild 2597 BLAKE2B 38ba299dc0db1edac052fa0336a4723f395e0c7a1372c66269f0c012a2ccc17e11c929f050d1dab935bb976ff5702cfc4f9399893aa322a347ad73fa2651911f SHA512 29071b95a57a12e68fdcfb0641d5fb0a357aff1b77aebe607f777e6ded28d1472764f6bcb01987dcd3296cef20c50bce820cc1f166255650adfae6ebe834e9a2
diff --git a/sys-fs/xfsprogs/xfsprogs-6.11.0.ebuild b/sys-fs/xfsprogs/xfsprogs-6.11.0.ebuild
index ce66faf7bc7b..7d4dad4ed686 100644
--- a/sys-fs/xfsprogs/xfsprogs-6.11.0.ebuild
+++ b/sys-fs/xfsprogs/xfsprogs-6.11.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~loong ~mips ppc ~ppc64 ~riscv ~s390 sparc x86"
 IUSE="icu libedit nls selinux static-libs"
 
 RDEPEND="
diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index e229e90a28fd..9ac815b5093f 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -7,6 +7,8 @@ DIST zfs-2.2.5.tar.gz 33896824 BLAKE2B ec73c866bf931e4af63a35b3e61e1254d681d21aa
 DIST zfs-2.2.5.tar.gz.asc 836 BLAKE2B ae6e47ce82ffda8834047e03f361ca096448f98ea811a09c0c68b202996c613e6524501cda49873acc4bca9f60c298635f89e5d7fe8f00ffa05b192fc98e16ef SHA512 0a397471c3f1ee9675eb9fcd589409c5085f8692930275ea15d92042fadaf1d3772666a3cca5adb1730c953464e0ec00f501cc5333a303d322c636020c2a7060
 DIST zfs-2.2.6.tar.gz 33900138 BLAKE2B 0bbe36df779aaf19460a75725af9c9b13e64e77a6020974ad18d60d9fd52db2ddd6ea98b3e6c7451195bdfb347b8aab51db9b3f9a7c15c77bff47329bbd07dd2 SHA512 c217a3397b67d7239bc30bc492d58fff96bb29c9cf73e390d1787a4fb787cb297557e594a926453fed11faaab80363d40853af271f8ee18ce9a317dfde4c6745
 DIST zfs-2.2.6.tar.gz.asc 836 BLAKE2B db66f3e2e629ab8a344a8e0c2609bcbb98d69d110fc9e064760ee0c5c25cd67421a71764c4b65d7005e8ff66167bf24beb4be2560a47318eabffa888c1539f26 SHA512 d09f343b3acc3a81e96c069072cfb16d0b490ee77562f50e14524faf05560f9e1d1325ec4bc1760c86ed29186d5860d59646d4ea07385ee3b28d879f2374b9b4
+DIST zfs-2.2.7.tar.gz 33852602 BLAKE2B 31a066d5d543e3328d1afd065a8da4f9b4c52433d585cdbb41936900fd1453431585c6bc4b6e6d9a497a03e79969bae883e17cf4677099686feb3e32577d2777 SHA512 6493faa8e31d9c042c4e8f748d32cb9243212fdf4e0341c19568b47bcf302e60beb89940b80374610b71e1dca1ca5813f3efaddbf1a2453ceabb38381165b271
+DIST zfs-2.2.7.tar.gz.asc 836 BLAKE2B e8fc5e04f5b37a22c741bda46b4573e0cebe85da051c73cf3c5fc267de3c313399b235fc346ca06f4c22d37d2500044a26adb3ea241a65fbcf8760d0ef880039 SHA512 8d22a64c920c2a983429688a340f4ae281decdd30e465591e6b40af9f3016b8f168f4e8ea460600c832a2f46b383ff307986649a645585fb25c34fdfda75ad6e
 DIST zfs-2.3.0-rc1.tar.gz 33887119 BLAKE2B dd4e159bef6de216cc51c1dd22620e6edb5b7503d95402022d0b9439471fe432181b1e5df2142e63cdac812a74b62657a96573b3bf48ad78bd6fd885a5f8913e SHA512 fe7de046dd48dbb67545726482a501788a1d5601e6e9a17deeb29047946689d9c8deb95f72b2b47c26a205a3c94fa1f0123437479a06b1376b9dac3dd6faf463
 DIST zfs-2.3.0-rc1.tar.gz.asc 195 BLAKE2B f70e6223e94a3f79d6d685b2b06254fba845d79768c82b7a3fedb865b6e6c97499c497def0f4c3e4a2869fed88b0965650ae88d5eb72c0ffaed43c4479d3bf96 SHA512 26b395feaf03e2be20b75ef64e573aa98a0706c46a1eb57503925731bf0cb9bf7fef8a2cdcf163233bccd7da9f5aedc0cae73f0183f39e0f13dcf315b4a5d809
 DIST zfs-2.3.0-rc3.tar.gz 33897910 BLAKE2B 518e2c56130a71d4c35f27328184e882815e2ca5b0524e660e174176bee4fdc554e4d1c8264d71f84b6c9641c08088f96a5c35adb5ef6f21b814ccadf093a256 SHA512 1ac53d3a006580f4a32fa33dddd6600d8abac401ed9fc86a2950a8241e0a9dc4a8954a32c44b28b10f22ba7c5cbd8871d9f21c13ccc291c366e9745e83431723
@@ -15,6 +17,7 @@ EBUILD zfs-kmod-2.1.15.ebuild 4188 BLAKE2B 5c8a646f0a674f6caf6fb65bcd785af9eb26c
 EBUILD zfs-kmod-2.1.16.ebuild 4191 BLAKE2B 8dd7d93e44b4e12d931c884ce31cbc6f0e3172ca8da925f401840ab019a8c429df8074d43cf2e2c93b8f1b94457eec23633ba803804ac7e3d389dbaed11a9fe4 SHA512 404931126cb21b58f0bb1a566e12403871f03aa2192d8e598d94098c46b5bf34e6c06dce657b94201e2d04b7042b96f4ea78020a28b2730f77b14c7b8fbf59fa
 EBUILD zfs-kmod-2.2.5.ebuild 5523 BLAKE2B bb672c18784633c6d1605eb0d46018a015f73853e217a92922043b1183c36ebacc0292708f361b3379b19668f74ebaa6b63019faf9f78bb9e967754d1d0732cd SHA512 198f84fc9946a0f580c8b5b8176ef15aaa7fd6c1c04aff4f75f24a0f1851c1d8ba98b6fa343c6b8c62d96832b4d17b2ece2e20e6dff46803846f605e2cf03885
 EBUILD zfs-kmod-2.2.6.ebuild 5527 BLAKE2B adf536ab3827f6568fdd565c828e4ffc1baee7f2138642058c9d1265b3ab7c5b0dec68da365a85e0b95fbdd6ff8ecef55f522d65920e652ca17eec6eb4a72762 SHA512 76e8d5657b07c7258c1877bdd951346d97b9f23560bcadd449919a6929fec1dcf44e7df40a6f1376f5a5a92c0fecf78376c322fcad09ec59010758288905e15a
+EBUILD zfs-kmod-2.2.7.ebuild 5527 BLAKE2B 6c05385c4a5201b4c26acbc9019c33a446922e677f5ff1e071e4f5dda9f76656b22f267b8d98c92cf745ac9c389929b9f0b6364a7614d4d902969b2b89c764f9 SHA512 6a46a6769f03c98426f6f147e519fa21ab9fab1b25e78c322a00a03f7aa414ac327b605ad2c49a290aba070db26dd8be4d688e5f0bd5768cc0d0573e975b46a4
 EBUILD zfs-kmod-2.3.0_rc1.ebuild 5527 BLAKE2B e34140a512985eaac32c2842abf7b988761287a66d3ae8e0de6867442b33a940917a961cfc46d0a7256440d1bc7abcd4f36258003403c2718b498c23583615af SHA512 c9287792af68052357a940328d14717a9eb832e6628774a6b354595c585ee87f4a16212ddc67e6dbc818012e7ccb27a678a442078a3c72d8e0a3568c259f714f
 EBUILD zfs-kmod-2.3.0_rc3.ebuild 5527 BLAKE2B e34140a512985eaac32c2842abf7b988761287a66d3ae8e0de6867442b33a940917a961cfc46d0a7256440d1bc7abcd4f36258003403c2718b498c23583615af SHA512 c9287792af68052357a940328d14717a9eb832e6628774a6b354595c585ee87f4a16212ddc67e6dbc818012e7ccb27a678a442078a3c72d8e0a3568c259f714f
 EBUILD zfs-kmod-9999.ebuild 5527 BLAKE2B 6c05385c4a5201b4c26acbc9019c33a446922e677f5ff1e071e4f5dda9f76656b22f267b8d98c92cf745ac9c389929b9f0b6364a7614d4d902969b2b89c764f9 SHA512 6a46a6769f03c98426f6f147e519fa21ab9fab1b25e78c322a00a03f7aa414ac327b605ad2c49a290aba070db26dd8be4d688e5f0bd5768cc0d0573e975b46a4
diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.2.7.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.2.7.ebuild
new file mode 100644
index 000000000000..6f064f20b142
--- /dev/null
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.2.7.ebuild
@@ -0,0 +1,207 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MODULES_INITRAMFS_IUSE=+initramfs
+inherit autotools flag-o-matic linux-mod-r1 multiprocessing
+
+DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs"
+HOMEPAGE="https://github.com/openzfs/zfs"
+
+MODULES_KERNEL_MAX=6.12
+MODULES_KERNEL_MIN=4.18
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/openzfs/zfs.git"
+	inherit git-r3
+	unset MODULES_KERNEL_MAX
+else
+	VERIFY_SIG_OPENPGP_KEY_PATH=/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-${MY_PV}"
+
+	ZFS_KERNEL_COMPAT="${MODULES_KERNEL_MAX}"
+	# 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 ~loong ~ppc64 ~riscv ~sparc"
+	fi
+fi
+
+LICENSE="CDDL MIT debug? ( GPL-2+ )"
+SLOT="0/${PVR}"
+IUSE="custom-cflags debug +rootfs"
+RESTRICT="test"
+
+BDEPEND="
+	app-alternatives/awk
+	dev-lang/perl
+"
+
+if [[ ${PV} != 9999 ]] ; then
+	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-openzfs )"
+
+	IUSE+=" +dist-kernel-cap"
+	RDEPEND="
+		dist-kernel-cap? ( dist-kernel? (
+			<virtual/dist-kernel-${ZFS_KERNEL_DEP}
+		) )
+	"
+fi
+
+# Used to suggest matching USE, but without suggesting to disable
+PDEPEND="dist-kernel? ( ~sys-fs/zfs-${PV}[dist-kernel] )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.1.11-gentoo.patch
+)
+
+pkg_pretend() {
+	use rootfs || return 0
+}
+
+pkg_setup() {
+	local CONFIG_CHECK="
+		EFI_PARTITION
+		ZLIB_DEFLATE
+		ZLIB_INFLATE
+		!DEBUG_LOCK_ALLOC
+		!PAX_KERNEXEC_PLUGIN_METHOD_OR
+	"
+	use debug && CONFIG_CHECK+="
+		DEBUG_INFO
+		FRAME_POINTER
+		!DEBUG_INFO_REDUCED
+	"
+	use rootfs && CONFIG_CHECK+="
+		BLK_DEV_INITRD
+		DEVTMPFS
+	"
+
+	kernel_is -lt 5 && 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
+
+	linux-mod-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# Run unconditionally (bug #792627)
+	eautoreconf
+
+	if [[ ${PV} != 9999 ]] ; then
+		# Set module revision number
+		sed -Ei "s/(Release:.*)1/\1${PR}-gentoo/" META || die
+	fi
+}
+
+src_configure() {
+	use custom-cflags || strip-flags
+	filter-ldflags -Wl,*
+
+	local myconf=(
+		--bindir="${EPREFIX}"/bin
+		--sbindir="${EPREFIX}"/sbin
+		--with-config=kernel
+		--with-linux="${KV_DIR}"
+		--with-linux-obj="${KV_OUT_DIR}"
+		$(use_enable debug)
+
+		# See gentoo.patch
+		GENTOO_MAKEARGS_EVAL="${MODULES_MAKEARGS[*]@Q}"
+		TEST_JOBS="$(makeopts_jobs)"
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	emake "${MODULES_MAKEARGS[@]}"
+}
+
+src_install() {
+	emake "${MODULES_MAKEARGS[@]}" DESTDIR="${ED}" install
+	modules_post_process
+
+	dodoc AUTHORS COPYRIGHT META README.md
+}
+
+_old_layout_cleanup() {
+	# new files are just extra/{spl,zfs}.ko with no subdirs.
+	local olddir=(
+		avl/zavl
+		icp/icp
+		lua/zlua
+		nvpair/znvpair
+		spl/spl
+		unicode/zunicode
+		zcommon/zcommon
+		zfs/zfs
+		zstd/zzstd
+	)
+
+	# kernel/module/Kconfig contains possible compressed extentions.
+	local kext kextfiles
+		for kext in .ko{,.{gz,xz,zst}}; do
+		kextfiles+=( "${olddir[@]/%/${kext}}" )
+	done
+
+	local oldfile oldpath
+	for oldfile in "${kextfiles[@]}"; do
+		oldpath="${EROOT}/lib/modules/${KV_FULL}/extra/${oldfile}"
+		if [[ -f "${oldpath}" ]]; then
+			ewarn "Found obsolete zfs module ${oldfile} for current kernel ${KV_FULL}, removing."
+			rm -rv "${oldpath}" || die
+			# we do not remove non-empty directories just for safety in case there's something else.
+			# also it may fail if there are both compressed and uncompressed modules installed.
+			rmdir -v --ignore-fail-on-non-empty "${oldpath%/*.*}" || die
+		fi
+	done
+}
+
+pkg_postinst() {
+	# Check for old module layout before doing anything else.
+	# only attempt layout cleanup if new .ko location is used.
+	local newko=( "${EROOT}/lib/modules/${KV_FULL}/extra"/{zfs,spl}.ko* )
+	# We check first array member, if glob above did not exand, it will be "zfs.ko*" and -f will return false.
+	# if glob expanded -f will do correct file precense check.
+	[[ -f ${newko[0]} ]] && _old_layout_cleanup
+
+	linux-mod-r1_pkg_postinst
+
+	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/Manifest b/sys-fs/zfs/Manifest
index 247ffa9401b8..ec17f0400592 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/Manifest
@@ -10,6 +10,8 @@ DIST zfs-2.2.5.tar.gz 33896824 BLAKE2B ec73c866bf931e4af63a35b3e61e1254d681d21aa
 DIST zfs-2.2.5.tar.gz.asc 836 BLAKE2B ae6e47ce82ffda8834047e03f361ca096448f98ea811a09c0c68b202996c613e6524501cda49873acc4bca9f60c298635f89e5d7fe8f00ffa05b192fc98e16ef SHA512 0a397471c3f1ee9675eb9fcd589409c5085f8692930275ea15d92042fadaf1d3772666a3cca5adb1730c953464e0ec00f501cc5333a303d322c636020c2a7060
 DIST zfs-2.2.6.tar.gz 33900138 BLAKE2B 0bbe36df779aaf19460a75725af9c9b13e64e77a6020974ad18d60d9fd52db2ddd6ea98b3e6c7451195bdfb347b8aab51db9b3f9a7c15c77bff47329bbd07dd2 SHA512 c217a3397b67d7239bc30bc492d58fff96bb29c9cf73e390d1787a4fb787cb297557e594a926453fed11faaab80363d40853af271f8ee18ce9a317dfde4c6745
 DIST zfs-2.2.6.tar.gz.asc 836 BLAKE2B db66f3e2e629ab8a344a8e0c2609bcbb98d69d110fc9e064760ee0c5c25cd67421a71764c4b65d7005e8ff66167bf24beb4be2560a47318eabffa888c1539f26 SHA512 d09f343b3acc3a81e96c069072cfb16d0b490ee77562f50e14524faf05560f9e1d1325ec4bc1760c86ed29186d5860d59646d4ea07385ee3b28d879f2374b9b4
+DIST zfs-2.2.7.tar.gz 33852602 BLAKE2B 31a066d5d543e3328d1afd065a8da4f9b4c52433d585cdbb41936900fd1453431585c6bc4b6e6d9a497a03e79969bae883e17cf4677099686feb3e32577d2777 SHA512 6493faa8e31d9c042c4e8f748d32cb9243212fdf4e0341c19568b47bcf302e60beb89940b80374610b71e1dca1ca5813f3efaddbf1a2453ceabb38381165b271
+DIST zfs-2.2.7.tar.gz.asc 836 BLAKE2B e8fc5e04f5b37a22c741bda46b4573e0cebe85da051c73cf3c5fc267de3c313399b235fc346ca06f4c22d37d2500044a26adb3ea241a65fbcf8760d0ef880039 SHA512 8d22a64c920c2a983429688a340f4ae281decdd30e465591e6b40af9f3016b8f168f4e8ea460600c832a2f46b383ff307986649a645585fb25c34fdfda75ad6e
 DIST zfs-2.3.0-rc1.tar.gz 33887119 BLAKE2B dd4e159bef6de216cc51c1dd22620e6edb5b7503d95402022d0b9439471fe432181b1e5df2142e63cdac812a74b62657a96573b3bf48ad78bd6fd885a5f8913e SHA512 fe7de046dd48dbb67545726482a501788a1d5601e6e9a17deeb29047946689d9c8deb95f72b2b47c26a205a3c94fa1f0123437479a06b1376b9dac3dd6faf463
 DIST zfs-2.3.0-rc1.tar.gz.asc 195 BLAKE2B f70e6223e94a3f79d6d685b2b06254fba845d79768c82b7a3fedb865b6e6c97499c497def0f4c3e4a2869fed88b0965650ae88d5eb72c0ffaed43c4479d3bf96 SHA512 26b395feaf03e2be20b75ef64e573aa98a0706c46a1eb57503925731bf0cb9bf7fef8a2cdcf163233bccd7da9f5aedc0cae73f0183f39e0f13dcf315b4a5d809
 DIST zfs-2.3.0-rc3.tar.gz 33897910 BLAKE2B 518e2c56130a71d4c35f27328184e882815e2ca5b0524e660e174176bee4fdc554e4d1c8264d71f84b6c9641c08088f96a5c35adb5ef6f21b814ccadf093a256 SHA512 1ac53d3a006580f4a32fa33dddd6600d8abac401ed9fc86a2950a8241e0a9dc4a8954a32c44b28b10f22ba7c5cbd8871d9f21c13ccc291c366e9745e83431723
@@ -18,6 +20,7 @@ EBUILD zfs-2.1.15.ebuild 8907 BLAKE2B fd489ab42d59038c4621177e32301694fae72c402e
 EBUILD zfs-2.1.16.ebuild 8910 BLAKE2B 5ec1d88d4a385cda9e604700688b48ac23c2eefafc9285300c56566e5ecf5d76f54fa3a9fa78f772f6ac29f1e487b84098a4c18dbd4620741bdc3f7cfa25cd93 SHA512 464f8539796fa44d597daedf091219c0383bcc64446b2406dee891966ba526c5b1ceba50c0610beb42f4365119310c530b5e01d65375ac4c2d3d8dc1812afb14
 EBUILD zfs-2.2.5.ebuild 8913 BLAKE2B f5cc15db3c737b46e1bc34ea9b0043e1a0cca7cf146efa1bfd9639ebba8fb64a3707ccb74780765892aeac4d9000868ec8ddad721ddbb5d65b1d5c8e2b3beba2 SHA512 511a673be6fa6db212129e6056208ac218dd64c2488c46ba2633c11f1c7008189548749c47b20b75d42887e965c8186cea2b8b815af7b083c5f9ff841328d1ee
 EBUILD zfs-2.2.6.ebuild 8916 BLAKE2B cbf3f148cf51cdf10566ed6054199f87392d118521ad3bb8cdb83535f57e43838bf49df963cd6d5ea55dab3c238aea54c67fea963de9f3a14edabbaeb824ac71 SHA512 4e9c76e3c84c5e6052b926860f940a6e4727e6539acc48773460dc33803d4960456bf50b80259cffc85a71adaa1b28897148e0f0acd785bb9a7f2228b338607d
+EBUILD zfs-2.2.7.ebuild 8916 BLAKE2B cbf3f148cf51cdf10566ed6054199f87392d118521ad3bb8cdb83535f57e43838bf49df963cd6d5ea55dab3c238aea54c67fea963de9f3a14edabbaeb824ac71 SHA512 4e9c76e3c84c5e6052b926860f940a6e4727e6539acc48773460dc33803d4960456bf50b80259cffc85a71adaa1b28897148e0f0acd785bb9a7f2228b338607d
 EBUILD zfs-2.3.0_rc1.ebuild 8878 BLAKE2B 7965e6fdfc1995db25e5029876d54750fc7848094d9a8ff3b67533a61d437686f9c12a8330d6032a92331069d0affa09e6b1b2a6ecea70bc977e06eed98b32c7 SHA512 d645c5e9303a6dc4643cbb232e0053eec96b8f861499bf6e38259c55b2e27c758217230d35727e487c8cb3d6bcc0445354871ec65aab85b8a1e524cbae9d4ab7
 EBUILD zfs-2.3.0_rc3.ebuild 8846 BLAKE2B 089f870033b0e3c3d7477f4c4133a6d3dc1b42338cf837b26dc2da8dd4c5ab7d09e524b66a701733e4560505e626e0b03d34ad95b42fe1ddeeb998cfc81a6617 SHA512 4cb3a58edc64102635ad94210ff52fcf009e00e6e855a7111da63e6d25f4cba76fd21c1b571eb919dbbc34f250bb95eae96fc5a39e551b8877cd5b8e0b8ec5f4
 EBUILD zfs-9999.ebuild 8846 BLAKE2B 089f870033b0e3c3d7477f4c4133a6d3dc1b42338cf837b26dc2da8dd4c5ab7d09e524b66a701733e4560505e626e0b03d34ad95b42fe1ddeeb998cfc81a6617 SHA512 4cb3a58edc64102635ad94210ff52fcf009e00e6e855a7111da63e6d25f4cba76fd21c1b571eb919dbbc34f250bb95eae96fc5a39e551b8877cd5b8e0b8ec5f4
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 000000000000..5264247e69af
--- /dev/null
+++ b/sys-fs/zfs/zfs-2.2.7.ebuild
@@ -0,0 +1,310 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_OPTIONAL=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit autotools bash-completion-r1 dist-kernel-utils distutils-r1 flag-o-matic linux-info pam systemd udev usr-ldscript
+
+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"
+else
+	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}"
+
+	if [[ ${PV} != *_rc* ]]; then
+		KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~sparc"
+	fi
+fi
+
+LICENSE="BSD-2 CDDL MIT"
+# just libzfs soname major for now.
+# 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 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*')
+	)
+	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}]
+		)
+	)
+"
+
+if [[ ${PV} != "9999" ]] ; then
+	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
+	)
+"
+
+# PDEPEND in this form is needed to trick portage suggest
+# enabling dist-kernel if only 1 package have it set, without suggesting to disable
+PDEPEND="dist-kernel? ( ~sys-fs/zfs-kmod-${PV}[dist-kernel] )"
+
+REQUIRED_USE="
+	!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
+)
+
+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() {
+	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
+}
+
+src_prepare() {
+	default
+	libsoversion_check
+
+	# 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 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
+
+	# 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)
+		$(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
+}
+
+src_install() {
+	default
+
+	gen_usr_ldscript -a nvpair uutil zfsbootenv zfs zfs_core zpool
+
+	use pam && { rm -rv "${ED}/unwanted_files" || die ; }
+
+	use test-suite || { rm -r "${ED}"/usr/share/zfs/{test-runner,zfs-tests,runfiles,*sh} || die ; }
+
+	find "${ED}" -name '*.la' -delete || die
+
+	dobashcomp contrib/bash_completion.d/zfs
+	bashcomp_alias zfs zpool
+
+	# 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
+
+	# 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
+}
+
+pkg_postrm() {
+	udev_reload
+}