21 files changed, 587 insertions, 581 deletions
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 29c1b7efd52e..858796710a4b 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/erofs-utils/Manifest b/sys-fs/erofs-utils/Manifest
index 3a0bc34d8528..a103459dfc73 100644
--- a/sys-fs/erofs-utils/Manifest
+++ b/sys-fs/erofs-utils/Manifest
@@ -1,5 +1,3 @@
-DIST erofs-utils-1.7.tar.gz 165393 BLAKE2B f22183fbc3346db0632f0fc842586251d0e17ea19e1de3be51cd807dfac4a6150a080d6b81625c3e08eeebc2ae28d7840f8209c905ca87fc70481d3d8c3913ec SHA512 0f204cd40644bde28f9bd0c5c234d93e68db3a3998bb089f43bfb3ce9a9db1e1cc2fa65919205cbd4a484fa4388cffadf5b395bc4363de3882e1a19778c2d62b
-DIST erofs-utils-1.8.1.tar.gz 184385 BLAKE2B 0ecf7ad0d42f3941751511f3ab42e7e25b85dc64849867a221272cf4596f6bfff3cb1c22877a485de79b4445f68eea8e77cb3f8c742a23ee5ad7ce0232b85091 SHA512 b7fe2441e5295680bc683e978ad97ee359785fd842d77fa86ef6bf869b5da87ad613f48782b5f59684995b6cbc5c274938c9ea9067baa537f09c029eabb4cca3
-EBUILD erofs-utils-1.7.ebuild 1006 BLAKE2B 362142e2d8da00981233599debae7463c5300571cdab96305e3b1ad7a120857aa84ab774b0807600f14b26a089477556a3e4e15e52a16e763b75aeac45dddc61 SHA512 e5e007b1a4a554b55865ef418dc14ad4eec95de1f5c1f59c8beb07ff74aa748ac9b20b732e249c7ce1e1e82d46ce06ad2e683f8776bdcd79309c76eb8c55b72d
-EBUILD erofs-utils-1.8.1.ebuild 1258 BLAKE2B f9c180bb0ae7b899db5f16a413b6a45a4951d0cf5c694c5983fd3ad9547de090ec0093bf9b4464050527634de9ba722580db850e51a314dd9ac08ccc6491b972 SHA512 8e7c7ecca451e41e83306d10a7bf2be3a031e7a775467707ede52009c5dc79efd91cd8f7f9c3adf7f72d2f49fa67d8756fcced3dba6b2ca03f36da31a32def08
+DIST erofs-utils-1.8.4.tar.gz 187276 BLAKE2B da0d80abbfd9b2d547c30bad7647165a3500f20e5de0b5db4c54efb27ec895fd069be983193b06d35728f5a8e1490e6cd255207c76135d8978d86e1512430755 SHA512 c941b0a2ab6c650a9aa4c9cadeb277ebc87007dc51354ff013c7cb763e6e8c9d44ed9e4791730ed05088faaba8c612198b924e70f5e52019382cfdf6d2e6b677
+EBUILD erofs-utils-1.8.4.ebuild 1394 BLAKE2B f228bec013902e641013c30fbb3694551fdbbfd8147a315a1bbbc68779143db0cd627e10609d2c64c30efaa473424be117b46611b3b41a1898e4bc878dd2eb04 SHA512 af46a0927f77ba64654d5fddfddeeda015ca41a425ffa050fbe0c918e72df86daf23ad03c7d1423cc455f658fd4916e5867df623acbf02a8a0b908038849f9dd
 MISC metadata.xml 561 BLAKE2B 021bc1323881f1d1e5aaf0ab2c49d393319048c31da034c297e6877a2c23f3e7bbf2392919df7bacfa75289ba11d051c2f896128e954348f3dd6c0850b847262 SHA512 2fb30129b20709a2cff8fa8b9fdb7e04aed0dd6df3c03306058109b0f85203273dbf925a16754a74a08b52f38c11dc1b1881419258e2fe1caa418c63b3c3d25f
diff --git a/sys-fs/erofs-utils/erofs-utils-1.7.ebuild b/sys-fs/erofs-utils/erofs-utils-1.7.ebuild
deleted file mode 100644
index bae6965ed9b7..000000000000
--- a/sys-fs/erofs-utils/erofs-utils-1.7.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="Userspace tools for EROFS"
-HOMEPAGE="https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git"
-LICENSE="GPL-2+"
-
-SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/xiang/${PN}.git/snapshot/${P}.tar.gz"
-KEYWORDS="~amd64 ~arm64 ~loong"
-
-SLOT="0"
-IUSE="fuse +lz4 +lzma selinux +uuid +zlib"
-
-RDEPEND="
-	fuse? ( sys-fs/fuse:0 )
-	lz4? ( app-arch/lz4:0= )
-	lzma? ( >=app-arch/xz-utils-5.4.0:0= )
-	selinux? ( sys-libs/libselinux:0= )
-	uuid? ( sys-apps/util-linux )
-	zlib? ( sys-libs/zlib:0= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-werror
-		$(use_enable fuse)
-		$(use_enable lz4)
-		$(use_enable lzma)
-		$(use_with selinux)
-		$(use_with uuid)
-		$(use_with zlib)
-		--without-libdeflate  # not packaged
-	)
-
-	econf "${myeconfargs[@]}"
-}
diff --git a/sys-fs/erofs-utils/erofs-utils-1.8.1.ebuild b/sys-fs/erofs-utils/erofs-utils-1.8.4.ebuild
index 07c3889f14bb..56cd91d0567f 100644
--- a/sys-fs/erofs-utils/erofs-utils-1.8.1.ebuild
+++ b/sys-fs/erofs-utils/erofs-utils-1.8.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2024 Gentoo Authors
+# Copyright 2021-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -17,6 +17,7 @@ KEYWORDS="~amd64 ~arm64 ~loong"
 IUSE="fuse libdeflate +lz4 +lzma selinux static-libs +threads +uuid +zlib +zstd"
 
 RDEPEND="
+	dev-libs/xxhash:0=
 	fuse? ( sys-fs/fuse:0 )
 	lz4? ( app-arch/lz4:0= )
 	lzma? ( >=app-arch/xz-utils-5.4.0:0= )
@@ -53,6 +54,9 @@ src_configure() {
 		$(use_with zlib)
 		$(use_with zstd libzstd)
 		--without-qpl  # not packaged
+		# do not use bundled xxhash; also upstream says "expected to be
+		# faster than the internal one"
+		--with-xxhash
 	)
 
 	econf "${myeconfargs[@]}"
diff --git a/sys-fs/ncdu-bin/Manifest b/sys-fs/ncdu-bin/Manifest
index 10ce2e1bd1ac..cb5d0195a763 100644
--- a/sys-fs/ncdu-bin/Manifest
+++ b/sys-fs/ncdu-bin/Manifest
@@ -1,19 +1,3 @@
-DIST ncdu-2.5-linux-aarch64.tar.gz 283085 BLAKE2B 28518e20460db8abbdfdfa6b61b61024b9550f5bf34fcea9682f5598d05cd417ad4b8b78b662e6cc6ad35b45f514cdfa2d35ef7677c50338a40345daf0ce4b57 SHA512 973139d158ad71ee80939aabb1a419668c95dd25f7e5d78ede78afa66bf1fe835e7c736ae1ba5b56fe6e0bde6125b46d6102629492582910947778821912d199
-DIST ncdu-2.5-linux-aarch64.tar.gz.asc 833 BLAKE2B ef4e246218a81c10aed27829f68a78fc96f9feb7a84dab6f32631ca400b480dc5ef36c185d6afc830537c15297da02ab7b58720576476509ebd554d0a1a338ae SHA512 d9ff6aee538cfbabfddcd59108baaa949e96df722c9e7f8fe81499640041d361b2a7473982cbd7e9a44ea2c5a1394cefd6a0a9bb05733775c0a354459d870ab1
-DIST ncdu-2.5-linux-arm.tar.gz 278582 BLAKE2B 07ff2c8463ff407c5fcafe65db7d3911215b3dd78ae3e65ee6aef43c57d8eea782eae741cebe83488f9b5b504bc9b8830d6cc586866e3a6fdb10b79c6fcff43b SHA512 7fb2ed31eda1e6e4a7f1749ed341d062aa6f6e4502ccd3e50fcfd5fb2e3f892f201d17d6eca605e281a3f2a6f95938fe0af62750b79bde051917cf40747fc374
-DIST ncdu-2.5-linux-arm.tar.gz.asc 833 BLAKE2B d2353572707b4a54053a0a2cc9a606b90d0d91bd42a12677ac9028e1ff64c41ec812056e734e34ff38ab8aaa5d2120b7aee1d8b14d6a3c1a3031dbfeab7dbf4b SHA512 d017e6f4a3546dad5b08ae3f9c8ff9470fa337955705f19175730415abd6f3032eb201f0a5e8876cde8b363259311524082e3ed6c652e9e5c2789d5eb560b3c8
-DIST ncdu-2.5-linux-x86.tar.gz 299610 BLAKE2B 0f644a185de2bc12a7714dec5f5269dad12f47a8e42399b7f5c579913312e5dc5060e7a12ada4ffd345367661baeea5fea50dbba381a1ee3f36d1048bba5f085 SHA512 88d7b8f42a80ddaa3faa6722c9d78669894b7e768e158ce39576e42d6a926912cc2e0f85c1dff1eeb1471ea4bc4fea69d7aa70b40e22782156c5ef28f59f8d28
-DIST ncdu-2.5-linux-x86.tar.gz.asc 833 BLAKE2B 907beb66a768d9639445539f98069b172fdd0c462b2eeb8872bd8c33bc9607a1cae9ccbb542d33717649e73d413f12a8792835cb89f3e7fdf534a2f69d75cbc8 SHA512 508cc5893cb8b1bd7138dbffe91933f007ecb5ac601c5a08806f5c55f541d0bc89111fd7091d1b9b1ebbc7978ff9d7f896d80e2c19e8e28d8973db3bd3b6ad40
-DIST ncdu-2.5-linux-x86_64.tar.gz 286301 BLAKE2B 92f7f6bdfa3838d657f53e14bb58be92e7b7aa2147f2bdd38fc9ac417bd0ffa14021eae587f0ba22c7277315b4251ce53fb78f8f7dbd1dad42d1805d0babe60e SHA512 2c48dd1ceb34de54cf64fcdabd81fea86a113c7914be2d2a17c9242ddbeffab69bf6ae9a51e1dd82f87c408f1cd61f4b1b32c960f4ab274db6c7fafaaa262e86
-DIST ncdu-2.5-linux-x86_64.tar.gz.asc 833 BLAKE2B 44becd2cef14a4b5e0359810c2d9f867afe282431e203db2f88aa3b21cc703174651cfe23e1f6077de779edb980cc7356a099ce926a4f029049d165dc9311640 SHA512 14636902d8475772d6ed3e3d194ef23a5613fe0bcb43a39a10e5598d392251fcf69b6711904f36fbc5a9c13a6953d7c4bcc02e0fdee2c93b2ef7e6c1597fab60
-DIST ncdu-2.6-linux-aarch64.tar.gz 365642 BLAKE2B 721841435e89ea747db547a781a6bf277dde3fdb20231774b658ba3282b211010f672be9d7aa1f4d4d12bbf7e2e22e96859379c34108a43aab52da8bb47dd7da SHA512 f56622e2b3697129b4b12d5429bdb2f5b1ee175977952a532f6cea0ea0e85c8a6f036b247a3e6f28da5da3d568a8554ad39921238261519bd6953b8b1878a6af
-DIST ncdu-2.6-linux-aarch64.tar.gz.asc 833 BLAKE2B c025836c1b4cf30e02d8b4e12df33d4bee638372a79511f0337529b48b3d1943756cc81cfaaf4bd81fc68432e7d6c8c2778e314dcd8725e087350474c80085be SHA512 443607b81a97a2f1a3b59630c0638c67d91688e87a67d67c0616412e4898802bc1bd1695f2db761b55a4e1de11014aaaabad9e6ed4c6fd8703b922ebb23c1415
-DIST ncdu-2.6-linux-arm.tar.gz 366584 BLAKE2B 3cd6c34ab8a4089e9e15e80dd4983a8693a6fd65c2b6651fa2a52990455eb1c0c02b83e7ff399a9041f59c99634342c6830db72e09cbe7a3c6881abcc9729aef SHA512 5e673a49c454a37871c097bbe19e6cb990b3099bb7f0c97c75e39791e48127233e58db708aa1d022778f9b67966bc03eb29ed60cd532ca16434fda5fd6ff56be
-DIST ncdu-2.6-linux-arm.tar.gz.asc 833 BLAKE2B db6ef016e69f0b4366e22106a646d9af33002ffd7e14d75a1a43b622f0bdec7e3c01546b0d633d7a362d781522bd0d9b32dcd57d24760b2ee1f9a1cfb4897518 SHA512 10f81f2e23074a279b648da9e241c256f9dacdc9dd1b093ccf44ad1c15e0cbd0e8f5befe290ab9ee794d2bebdec32191e49bddc77f60f74c32b875f1f02ed8c2
-DIST ncdu-2.6-linux-x86.tar.gz 363591 BLAKE2B fe2aa16b151c9a61a000f8fa860410bc91d7cbbd26631cd51c93db1d7c5268c7f90873771143f508494cec243c941904b2ec7d08e16ea27008203ffc8f9b5a96 SHA512 07ae22a19f88021fbf2bc07fc346e0b80915ca70ebd1ad8d29c53e4306e300fea24ad9c132fc18d15c3a10105b53409a93a61742e064367989c9bd6d9527947e
-DIST ncdu-2.6-linux-x86.tar.gz.asc 833 BLAKE2B 4391519e861694752c0fc3d72fb3ca5f19f45663cc0061d72924be4e145f024385fcfa24627458a175eaf45067bb43a2ee9c46a3e99de1b69f24a63bfafa6d7f SHA512 b6ff15431462f89ba03cc6bc1c21178956a48ac2535b1fa62f6edf4244c5b704ecf1e80735747a19a72ba3dc6e21f583eb15715959e16221feb6633926763aad
-DIST ncdu-2.6-linux-x86_64.tar.gz 348874 BLAKE2B 0cbbf2f4ce109e0f0c7aeddec044de86854facdc94153e04e11519d4c5d4d6af534678dea8ab1b343abc0cd681f5e29e9a9c3b04c104ef3405c7fcae8fba5556 SHA512 fd7a284165ffc19c7a3fabcad28ab17b30ed4d3117d045ca34fa144432d6a8fb051ebc9e4647a3ba8b1e3979864bd49924d0f3d9e9546b7bc19d99b8ba560ca9
-DIST ncdu-2.6-linux-x86_64.tar.gz.asc 833 BLAKE2B d05e8c3a277c6c7e9d6a23db47b333cc712d8a2d33c31864d669d6993b55e9cf1b314539bf3a3f4d523346b919c4cb5678ab26170ad4d7b6a2ed8ba14f73eb94 SHA512 d51c5cf8716cc3ceb4922625bca98308772f63cde88ce24a12e9f3ab0e631edf9452c64019b42d9de164f796401b7cc3a91a20683f484df5f00a13652fb6b30d
 DIST ncdu-2.7-linux-aarch64.tar.gz 369940 BLAKE2B a168fa3def0d5ae1d6d293ff53544b4b34b20361d7efdc415c8d0e85fbd04a49e767f64e840ee86a8f928a80b4702532af19e12227ae1edcf235cc25e43e3eae SHA512 75c1aae70ed16f5bcc4bebfc286a4dd9bf54ee8bf35f0ac33150a0f0c6f756e0b0779206e89afe322b65ad4873f5753cdff235eb980728602affbe6832f1cc9e
 DIST ncdu-2.7-linux-aarch64.tar.gz.asc 833 BLAKE2B 6d42854f51abc9321d3759c493c8699de5447a8c53f8f763a47888b721e726eb989a1ddfcd03d25638427d3e828dcdfb0a86b3590991d7f933eedc4710b58410 SHA512 90934a823fcba110406e901c3dd58d6ed1ff0a29b30176a69572408a0fa85cc3de6d639ebd1343cb9d08cf69cf8664acd86535d293dc3b5cbd02d1a503ee85ca
 DIST ncdu-2.7-linux-arm.tar.gz 370247 BLAKE2B 1d22a34287acc5059f627c418d0d441e36f6a8c1714317e9f0c83bc903e15e7e478e0139f32de0d91dabe2d2ae62ce60d25d73c0eca8239cf4979614a41759bb SHA512 74a7c4a3e689d7630038a5fd63b92ce5a03e3030e13eca40091e4f5251915e261ceefb9772b86145a22a4ae80c74c6e754766d196d4bf34512f65403118b736a
@@ -22,7 +6,5 @@ DIST ncdu-2.7-linux-x86.tar.gz 368703 BLAKE2B 37a67dcbff73e5dc759a83a08c302394b1
 DIST ncdu-2.7-linux-x86.tar.gz.asc 833 BLAKE2B 553d894b448371bd5c25cac08bfeca89a30ad42818d2f6100621a4bf885f6c02f2b525a070cb6c0e8f7a0e20215eabf1cf63e2ac928475e62ae08f6d1945bd27 SHA512 e5ea949b8a9e5b3e77b999562d1bd476838d85c90f8e9c07f135cc4bf4629cb6a16c067ecc23a445e9e99048b3d66bdd2dcd1677ad53cdc56b68fbdc978575ec
 DIST ncdu-2.7-linux-x86_64.tar.gz 353982 BLAKE2B 3f0388581201c6a810469b4cca0367c9ced1993ae37c291993cf68a3e17194ddd5e951312d7cad0b8fcdc11c9a5a7676839dcefe62d0f04684d56491f0d627cf SHA512 1e19ddc4fea35cbdb235e060cbccc10af90dd107443dd93f67a614f3579d6f48aabce601c65d02a01dc272c8a7ab2fcbd889b2a3490bf791702c0e222b83b025
 DIST ncdu-2.7-linux-x86_64.tar.gz.asc 833 BLAKE2B f9faa21167819133b017e5aaf459eb15dd540056eb8a708cb360934df4d41e6025e41a4db3558f359c781e9a6e9432b9970b501202ac81a5510dbe07cb8e9ce6 SHA512 edf98958de23e7caf0a41b0a895711ebf0fb1cd2cf65dbd30bbc23d0852fcd92a57538252da0e69b827acb94a04d561cab71993a15e461870af80691295a70e0
-EBUILD ncdu-bin-2.5.ebuild 1103 BLAKE2B 1066d04d40e1a3e528f78120c43486a97a3e6b5cb4d85cbd059af5f8a37b06ac48a01dfa98394c335681383b4c0f9df9e783e610b322470e5acfcfb51791d56f SHA512 7db69b449aae19cc541201ef5930a54bd728eeef0eab71fc1391812cf0a7deca71364921abf3a699b451abb62c5e9df3771a47d369a447d6dc41b9d3ddbc28c9
-EBUILD ncdu-bin-2.6.ebuild 1103 BLAKE2B 1066d04d40e1a3e528f78120c43486a97a3e6b5cb4d85cbd059af5f8a37b06ac48a01dfa98394c335681383b4c0f9df9e783e610b322470e5acfcfb51791d56f SHA512 7db69b449aae19cc541201ef5930a54bd728eeef0eab71fc1391812cf0a7deca71364921abf3a699b451abb62c5e9df3771a47d369a447d6dc41b9d3ddbc28c9
 EBUILD ncdu-bin-2.7.ebuild 1103 BLAKE2B 1066d04d40e1a3e528f78120c43486a97a3e6b5cb4d85cbd059af5f8a37b06ac48a01dfa98394c335681383b4c0f9df9e783e610b322470e5acfcfb51791d56f SHA512 7db69b449aae19cc541201ef5930a54bd728eeef0eab71fc1391812cf0a7deca71364921abf3a699b451abb62c5e9df3771a47d369a447d6dc41b9d3ddbc28c9
 MISC metadata.xml 862 BLAKE2B aecbc2cfec9351b2be9087d297016826f9bea5f81ea690e480cbe0dce5c627f554875fb9db5b19f21373391ef4fb28c7cea3129d911e80b7be007a9a0a79ac0a SHA512 2c722040961b930791780f704edddd4cdf010df05e462a0d333f2fbf4966c0ecac08eef3b1e05baf34013c95a91cc79dc38ef5616e07ffcb4e386b8760f89683
diff --git a/sys-fs/ncdu-bin/ncdu-bin-2.5.ebuild b/sys-fs/ncdu-bin/ncdu-bin-2.5.ebuild
deleted file mode 100644
index 76fc2f6bba95..000000000000
--- a/sys-fs/ncdu-bin/ncdu-bin-2.5.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit verify-sig
-
-DESCRIPTION="NCurses Disk Usage"
-HOMEPAGE="https://dev.yorhel.nl/ncdu"
-SRC_URI="
-	amd64? ( https://dev.yorhel.nl/download/ncdu-${PV}-linux-x86_64.tar.gz )
-	arm? ( https://dev.yorhel.nl/download/ncdu-${PV}-linux-arm.tar.gz )
-	arm64? ( https://dev.yorhel.nl/download/ncdu-${PV}-linux-aarch64.tar.gz )
-	x86? ( https://dev.yorhel.nl/download/ncdu-${PV}-linux-x86.tar.gz )
-	verify-sig? (
-		amd64? ( https://dev.yorhel.nl/download/ncdu-${PV}-linux-x86_64.tar.gz.asc )
-		arm? ( https://dev.yorhel.nl/download/ncdu-${PV}-linux-arm.tar.gz.asc )
-		arm64? ( https://dev.yorhel.nl/download/ncdu-${PV}-linux-aarch64.tar.gz.asc )
-		x86? ( https://dev.yorhel.nl/download/ncdu-${PV}-linux-x86.tar.gz.asc )
-	)
-"
-S="${WORKDIR}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~arm ~arm64 ~x86"
-
-BDEPEND="verify-sig? ( sec-keys/openpgp-keys-yorhel )"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/yoranheling.asc
-
-QA_PREBUILT="usr/bin/ncdu-bin"
-
-src_install() {
-	newbin ncdu ncdu-bin
-}
diff --git a/sys-fs/ncdu-bin/ncdu-bin-2.6.ebuild b/sys-fs/ncdu-bin/ncdu-bin-2.6.ebuild
deleted file mode 100644
index 76fc2f6bba95..000000000000
--- a/sys-fs/ncdu-bin/ncdu-bin-2.6.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit verify-sig
-
-DESCRIPTION="NCurses Disk Usage"
-HOMEPAGE="https://dev.yorhel.nl/ncdu"
-SRC_URI="
-	amd64? ( https://dev.yorhel.nl/download/ncdu-${PV}-linux-x86_64.tar.gz )
-	arm? ( https://dev.yorhel.nl/download/ncdu-${PV}-linux-arm.tar.gz )
-	arm64? ( https://dev.yorhel.nl/download/ncdu-${PV}-linux-aarch64.tar.gz )
-	x86? ( https://dev.yorhel.nl/download/ncdu-${PV}-linux-x86.tar.gz )
-	verify-sig? (
-		amd64? ( https://dev.yorhel.nl/download/ncdu-${PV}-linux-x86_64.tar.gz.asc )
-		arm? ( https://dev.yorhel.nl/download/ncdu-${PV}-linux-arm.tar.gz.asc )
-		arm64? ( https://dev.yorhel.nl/download/ncdu-${PV}-linux-aarch64.tar.gz.asc )
-		x86? ( https://dev.yorhel.nl/download/ncdu-${PV}-linux-x86.tar.gz.asc )
-	)
-"
-S="${WORKDIR}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~arm ~arm64 ~x86"
-
-BDEPEND="verify-sig? ( sec-keys/openpgp-keys-yorhel )"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/yoranheling.asc
-
-QA_PREBUILT="usr/bin/ncdu-bin"
-
-src_install() {
-	newbin ncdu ncdu-bin
-}
diff --git a/sys-fs/ncdu/Manifest b/sys-fs/ncdu/Manifest
index 176238291b21..6ce4568ec2c7 100644
--- a/sys-fs/ncdu/Manifest
+++ b/sys-fs/ncdu/Manifest
@@ -1,17 +1,7 @@
-DIST ncdu-1.20.tar.gz 150835 BLAKE2B 0bb6576ecbb3df281c67a48409db2118521760f378defd9c082f732519c9828451b77897ca49e777674ae73a5aac0fd975b94d5a95b1689cd552b5840ac3b5de SHA512 af9a45cc27bb3cdee7fd65236b9b48cb604f9e54208a762ed7b3b18333e07e87a8ae5a4cd0071496e7e382c60a7760734cad1f68fb69423a79fa3f050d2c09bb
-DIST ncdu-1.20.tar.gz.asc 833 BLAKE2B 487e3b4b1e83a2211e91307ff1ca1778059cc3f923e04b57bc5d4780d0108589a062861a25bafa58c357ad4495edce814a58eeb24087e06b958d8e23a02bbf22 SHA512 168bcc4255bbb7a576af39422797804726f84134dc342f59abfc825f93c5ee4e9fcaa9e0c18626ee87b96b2d19a7c57beaa8e1b3dc57eff2bd659add18027140
 DIST ncdu-1.21.tar.gz 152622 BLAKE2B e16d79a96533ecc8c5bbcbb32cc6080d61e859a9cf8e0cdf5abed28a9f848a347151fb6ec7c28aff3f3fd0420233883f5fd5c72981322227e22da4b01eebb7b7 SHA512 10ffb2fdacf465a410e8733acc3f2f7f6304998e8e6cb9b4c42b5c6aa6e588ef7d262b72d5d83d8bbc80964fa9850b4b4a9bc9c58224fb41598eeae399771674
 DIST ncdu-1.21.tar.gz.asc 833 BLAKE2B 12751c09235d6c91087141b249c76323627c75adb7d40e7ad0a839a4e25d738567a50f95906e95e1d6e3c820295b124ec1f01714b7718ff4adf5ee2a6d5d2570 SHA512 5051b67bed35ebc84302f121851ecaa17b146a5dccbc96f49966a39fd404d777450bf85a653be47ab01d8e675d3a821fbd9c8f25bb934abf481faa57cc8b1873
-DIST ncdu-2.5.tar.gz 56019 BLAKE2B c10fb19f87c3d26334038ee96d857e547f9f6881518a675d9777a6c46cf456748861d84df190c14d6d2582f5ad3998ecdf9d00f0969c996221c0d1d9787570a3 SHA512 f4d499a3ab98a56667c75554c77951e4a42f5acdc1353875c108b0da469665777564405b8fcea5a731de473afacfda9f2c8701ba0ba989de1260119c64d7a9f8
-DIST ncdu-2.5.tar.gz.asc 833 BLAKE2B 86babaf8720898a5bd83a2cc290deb2f0a8041087b9f0afddd2306766b82877bbf51f45ac3622761f231359b2e5f60b8d6c5479963aaf7a6abdf67d24fb18496 SHA512 a28751371f7e7a033379fb5f5dc885c69e716f8b6654b8ee9e5eb023a22b67ca99e3ee813ddc2e335d6e8db9bd5a9a19359910a1b8aad13132f7a8bed1d67d78
-DIST ncdu-2.6.tar.gz 72088 BLAKE2B 21d45bb428a56a040083165b9d467a526cd83eaa05b6f88b90a0b5dac0fa70dc4fd7e37ff52debc619b06103a95dad8ddc26fc9e77b6118eeb39aa97bfa0fd0e SHA512 e94612a56db3831d993d6ffd8c69a4cc2418ebf4b9a810e28444c103225ccc1f53ae31e448b94d40ccf2ab7d3a0af6e8ee02bc700123aca872b3bb35108e3d14
-DIST ncdu-2.6.tar.gz.asc 833 BLAKE2B 110bbb6e2db221316004d4491f174c40cdf8fca44e91290f7ea87fc6788de20c3fd6d90bd4b55e4e720736514509af87bcc5b6533b37a2889e20c023939776e6 SHA512 478afe4a51244bc11dfbea2c12fb217392186c1efe1403b44309e0f0e3d431393173282ebae32ceeca32f4ec3a93f35ca19ac962728cd3d7f06f26bccd56169b
 DIST ncdu-2.7.tar.gz 71122 BLAKE2B 10363968820da2dd3cb17c73eb3cba877ca229b896f44bbdd2b8b04c9e3d13aec8476c1968fc5c1841c856e51a1cba64f840e3320e5655bb2eb2bf7258a88f0e SHA512 58d29583f09f6707b2a903fa37b0f263969b32a289e1f8f442044edb1a61351c7ac841dccebf92af227b35a9e6a90fa298a84dad607ad084f2a5883196935229
 DIST ncdu-2.7.tar.gz.asc 833 BLAKE2B d0dbf91b359bdfaca412601933e0da51cff8d7105df2e0d8767a0231c1fe3f7b4dfb0174b9744a68da1b3726884c77a13a162a21a4006b1d7de8c0917b133b66 SHA512 9f1c8a4b6b316d55a143805da159f22a4facf147ecf805130bcbdf68c83a5b8b0586b231780e7eedd16b3b5587332a06a81c95bb0d47cdd73c44ec3fe867ced8
-EBUILD ncdu-1.20.ebuild 659 BLAKE2B 54817c34a87475b07af98fb846b7774b36f71384d33ff5eb31b87813dac43f6de72d84333b6a9ed172ab13a521ec9134bbd7c6e8d2269fee9c5e546a0eb20db1 SHA512 4cf3010ebd4db6ec1b79da28745c39093c8d76955fc6760fa9392f86ecb71bde0132abc7520f8a9f3f849d5feded9758e6ddb5fa525815f4546f179c6877b306
-EBUILD ncdu-1.21.ebuild 701 BLAKE2B 3c5f5e60baade3cb74b41d72f20eff98d40bd759f5b24b7ea94a38407cdc97fc60a3383560fa6251a503b2d42a7a845e2f93f80de0c0f5da37bb34adf1a5f031 SHA512 d4c481981f990c3df3bc29e5e99344f053cafef08de5ae510de58da9cb973ee73fb47df3cbc39b6d4982d348a3c2abdec22dbb0256edb0a9d0076407d6022c74
-EBUILD ncdu-2.5-r1.ebuild 2980 BLAKE2B be80dae11d1e919b970c52bd1a8ad9705995831973e6dc4370b4434ad62c6203d49b48191d40a6ff1b2fb4c4be44d61cafbaec9c231d023d895647271c2ac217 SHA512 b77bfc1bd658e39edc1f10a99726f5fdd23d4f7e2855f1e9319c534d53a830873ff9eb547470e853478e89ed57cf73771b53815779e8a054246f1c1bd03f5acc
-EBUILD ncdu-2.6.ebuild 2998 BLAKE2B ebbdf6710ad8ebb1a429bc42813018b6cb57203ba482cb815f0f0dd91eb57982810c5646b968ff99b77652ed069721bc2739afc7995b2ac57134b94e7abf1991 SHA512 1623ffb8aeeb5190394d2fa17d22a37ac134a458ac571f5b2db5c28a39eb7950ec85c7415698e95a18f88be7f66e3123582becac249488cdd5b9035e0ab3f357
+EBUILD ncdu-1.21.ebuild 695 BLAKE2B 6b918ca77c2b954c39c8d878ab1134f375febc8bf8ae325b34857e5a8b3848b71d3ccde7bf03d6afdd342055b457791dcdb29b003b05cb1d2a0d8d9ad1d2de85 SHA512 4eefe3ce9324754c66156ebea0570be468be99365c3a4f3d4de92c05817e99834b7df315d90d7e33410a9149cb346da0a3f9fa24b9fdd231a4c1b4fc75d8400b
 EBUILD ncdu-2.7-r1.ebuild 969 BLAKE2B 0ca7ef92235f879e6d3ac3eceb5a6b91e9f5672a195806a586a50fb151897b308bfb23382ad7408cba94fd9598a15bbc6715e3e9daaab30c3eaaf64bdf973641 SHA512 7224973a79181fa05165cea3a718ab3c12bce4b562a4a2ca02fcbc72d7ced0091a447a119c939105a243fd9c815f253c7308fe8911e8ee2b9cd7d36c9a7a3602
-EBUILD ncdu-2.7.ebuild 3054 BLAKE2B 539347d5a98a0ed01b0678dfac4d71bb90057955c9a2756bbfe548fe6c76f15089d95a2c2c82ae16ced76f21b7b04984d83f2df82bc2ab839e3da171c778ff38 SHA512 a92bd4fdfc2599f78be3fa34c59384bfe63ae8f2c32e47ba8478c1cebecaba46ac82eee6dbcf4cdc25e93f17a0bb893d451882f9b8da10cd5011ae464ab1de04
 MISC metadata.xml 862 BLAKE2B aecbc2cfec9351b2be9087d297016826f9bea5f81ea690e480cbe0dce5c627f554875fb9db5b19f21373391ef4fb28c7cea3129d911e80b7be007a9a0a79ac0a SHA512 2c722040961b930791780f704edddd4cdf010df05e462a0d333f2fbf4966c0ecac08eef3b1e05baf34013c95a91cc79dc38ef5616e07ffcb4e386b8760f89683
diff --git a/sys-fs/ncdu/ncdu-1.20.ebuild b/sys-fs/ncdu/ncdu-1.20.ebuild
deleted file mode 100644
index 5430ea4d92e1..000000000000
--- a/sys-fs/ncdu/ncdu-1.20.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit verify-sig
-
-DESCRIPTION="NCurses Disk Usage"
-HOMEPAGE="https://dev.yorhel.nl/ncdu"
-SRC_URI="
-	https://dev.yorhel.nl/download/${P}.tar.gz
-	verify-sig? ( https://dev.yorhel.nl/download/${P}.tar.gz.asc )
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-DEPEND="sys-libs/ncurses:=[unicode(+)]"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	verify-sig? ( sec-keys/openpgp-keys-yorhel )
-"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/yoranheling.asc
diff --git a/sys-fs/ncdu/ncdu-1.21.ebuild b/sys-fs/ncdu/ncdu-1.21.ebuild
index 3e128d3937e4..a14728b48d06 100644
--- a/sys-fs/ncdu/ncdu-1.21.ebuild
+++ b/sys-fs/ncdu/ncdu-1.21.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 DEPEND="sys-libs/ncurses:=[unicode(+)]"
 RDEPEND="${DEPEND}"
diff --git a/sys-fs/ncdu/ncdu-2.5-r1.ebuild b/sys-fs/ncdu/ncdu-2.5-r1.ebuild
deleted file mode 100644
index bd4cb00fd75a..000000000000
--- a/sys-fs/ncdu/ncdu-2.5-r1.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit verify-sig edo
-
-DESCRIPTION="NCurses Disk Usage"
-HOMEPAGE="https://dev.yorhel.nl/ncdu"
-SRC_URI="
-	https://dev.yorhel.nl/download/${P}.tar.gz
-	verify-sig? ( https://dev.yorhel.nl/download/${P}.tar.gz.asc )
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-EZIG_MIN="0.13"
-EZIG_MAX_EXCLUSIVE="0.14"
-
-DEPEND="sys-libs/ncurses:=[unicode(+)]"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	|| ( dev-lang/zig:${EZIG_MIN} dev-lang/zig-bin:${EZIG_MIN} )
-	virtual/pkgconfig
-	verify-sig? ( sec-keys/openpgp-keys-yorhel )
-"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/yoranheling.asc
-
-# see https://github.com/ziglang/zig/issues/3382
-# For now, Zig doesn't support CFLAGS/LDFLAGS/etc.
-QA_FLAGS_IGNORED="usr/bin/ncdu"
-
-# Many thanks to Florian Schmaus (Flowdalic)!
-# Adapted from https://github.com/gentoo/gentoo/pull/28986
-# Set the EZIG environment variable.
-zig-set_EZIG() {
-	[[ -n ${EZIG} ]] && return
-
-	if [[ -n ${EZIG_OVERWRITE} ]]; then
-		export EZIG="${EZIG_OVERWRITE}"
-		return
-	fi
-
-	local candidate selected selected_ver ver
-
-	for candidate in "${BROOT}"/usr/bin/zig-*; do
-		if [[ ! -L ${candidate} || ${candidate} != */zig?(-bin)-+([0-9.]) ]]; then
-			continue
-		fi
-
-		ver=${candidate##*-}
-
-		if [[ -n ${EZIG_EXACT_VER} ]]; then
-			ver_test "${ver}" -ne "${EZIG_EXACT_VER}" && continue
-
-			selected="${candidate}"
-			selected_ver="${ver}"
-			break
-		fi
-
-		if [[ -n ${EZIG_MIN} ]] \
-			   && ver_test "${ver}" -lt "${EZIG_MIN}"; then
-			# Candidate does not satisfy EZIG_MIN condition.
-			continue
-		fi
-
-		if [[ -n ${EZIG_MAX_EXCLUSIVE} ]] \
-			   && ver_test "${ver}" -ge "${EZIG_MAX_EXCLUSIVE}"; then
-			# Candidate does not satisfy EZIG_MAX_EXCLUSIVE condition.
-			continue
-		fi
-
-		if [[ -n ${selected_ver} ]] \
-			   && ver_test "${selected_ver}" -gt "${ver}"; then
-			# Candidate is older than the currently selected candidate.
-			continue
-		fi
-
-		selected="${candidate}"
-		selected_ver="${ver}"
-	done
-
-	if [[ -z ${selected} ]]; then
-		die "Could not find (suitable) zig installation in ${BROOT}/usr/bin"
-	fi
-
-	export EZIG="${selected}"
-	export EZIG_VER="${selected_ver}"
-}
-
-# Invoke zig with the optionally provided arguments.
-ezig() {
-	zig-set_EZIG
-
-	# Unfortunately, we cannot add more args here, since syntax is different
-	# for every subcommands. Yes, even target/cpu :( f.i. :
-	# -target/-mcpu for zig build-exe vs -Dtarget/-Dcpu for zig build-
-	# -OReleaseSafe for zig build-exe vs -DReleaseSafe for zig build
-	# (or even none, if hardcoded by upstream so choice is -Drelease=true/false)
-	# Ofc we can patch this, but still...
-
-	edo "${EZIG}" "${@}"
-}
-
-src_unpack() {
-	if use verify-sig; then
-		verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc}
-	fi
-	default
-}
-
-src_configure() {
-	zig-set_EZIG
-	export ZIG=${EZIG}
-}
-
-src_test() {
-	ezig build test -Doptimize=ReleaseFast
-}
-
-src_install() {
-	emake PREFIX="${ED}"/usr install
-
-	dodoc README.md ChangeLog
-}
diff --git a/sys-fs/ncdu/ncdu-2.6.ebuild b/sys-fs/ncdu/ncdu-2.6.ebuild
deleted file mode 100644
index fdcf0d107cab..000000000000
--- a/sys-fs/ncdu/ncdu-2.6.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit verify-sig edo
-
-DESCRIPTION="NCurses Disk Usage"
-HOMEPAGE="https://dev.yorhel.nl/ncdu"
-SRC_URI="
-	https://dev.yorhel.nl/download/${P}.tar.gz
-	verify-sig? ( https://dev.yorhel.nl/download/${P}.tar.gz.asc )
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-EZIG_MIN="0.13"
-EZIG_MAX_EXCLUSIVE="0.14"
-
-DEPEND="
-	app-arch/zstd
-	sys-libs/ncurses:=[unicode(+)]
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	|| ( dev-lang/zig:${EZIG_MIN} dev-lang/zig-bin:${EZIG_MIN} )
-	virtual/pkgconfig
-	verify-sig? ( sec-keys/openpgp-keys-yorhel )
-"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/yoranheling.asc
-
-# see https://github.com/ziglang/zig/issues/3382
-# For now, Zig doesn't support CFLAGS/LDFLAGS/etc.
-QA_FLAGS_IGNORED="usr/bin/ncdu"
-
-# Many thanks to Florian Schmaus (Flowdalic)!
-# Adapted from https://github.com/gentoo/gentoo/pull/28986
-# Set the EZIG environment variable.
-zig-set_EZIG() {
-	[[ -n ${EZIG} ]] && return
-
-	if [[ -n ${EZIG_OVERWRITE} ]]; then
-		export EZIG="${EZIG_OVERWRITE}"
-		return
-	fi
-
-	local candidate selected selected_ver ver
-
-	for candidate in "${BROOT}"/usr/bin/zig-*; do
-		if [[ ! -L ${candidate} || ${candidate} != */zig?(-bin)-+([0-9.]) ]]; then
-			continue
-		fi
-
-		ver=${candidate##*-}
-
-		if [[ -n ${EZIG_EXACT_VER} ]]; then
-			ver_test "${ver}" -ne "${EZIG_EXACT_VER}" && continue
-
-			selected="${candidate}"
-			selected_ver="${ver}"
-			break
-		fi
-
-		if [[ -n ${EZIG_MIN} ]] \
-			   && ver_test "${ver}" -lt "${EZIG_MIN}"; then
-			# Candidate does not satisfy EZIG_MIN condition.
-			continue
-		fi
-
-		if [[ -n ${EZIG_MAX_EXCLUSIVE} ]] \
-			   && ver_test "${ver}" -ge "${EZIG_MAX_EXCLUSIVE}"; then
-			# Candidate does not satisfy EZIG_MAX_EXCLUSIVE condition.
-			continue
-		fi
-
-		if [[ -n ${selected_ver} ]] \
-			   && ver_test "${selected_ver}" -gt "${ver}"; then
-			# Candidate is older than the currently selected candidate.
-			continue
-		fi
-
-		selected="${candidate}"
-		selected_ver="${ver}"
-	done
-
-	if [[ -z ${selected} ]]; then
-		die "Could not find (suitable) zig installation in ${BROOT}/usr/bin"
-	fi
-
-	export EZIG="${selected}"
-	export EZIG_VER="${selected_ver}"
-}
-
-# Invoke zig with the optionally provided arguments.
-ezig() {
-	zig-set_EZIG
-
-	# Unfortunately, we cannot add more args here, since syntax is different
-	# for every subcommands. Yes, even target/cpu :( f.i. :
-	# -target/-mcpu for zig build-exe vs -Dtarget/-Dcpu for zig build-
-	# -OReleaseSafe for zig build-exe vs -DReleaseSafe for zig build
-	# (or even none, if hardcoded by upstream so choice is -Drelease=true/false)
-	# Ofc we can patch this, but still...
-
-	edo "${EZIG}" "${@}"
-}
-
-src_unpack() {
-	if use verify-sig; then
-		verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc}
-	fi
-	default
-}
-
-src_configure() {
-	zig-set_EZIG
-	export ZIG=${EZIG}
-}
-
-src_test() {
-	ezig build test -Doptimize=ReleaseFast
-}
-
-src_install() {
-	emake PREFIX="${ED}"/usr install
-
-	dodoc README.md ChangeLog
-}
diff --git a/sys-fs/ncdu/ncdu-2.7.ebuild b/sys-fs/ncdu/ncdu-2.7.ebuild
deleted file mode 100644
index 82b789c71db2..000000000000
--- a/sys-fs/ncdu/ncdu-2.7.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit verify-sig edo
-
-DESCRIPTION="NCurses Disk Usage"
-HOMEPAGE="https://dev.yorhel.nl/ncdu https://code.blicky.net/yorhel/ncdu"
-SRC_URI="
-	https://dev.yorhel.nl/download/${P}.tar.gz
-	verify-sig? ( https://dev.yorhel.nl/download/${P}.tar.gz.asc )
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-EZIG_MIN="0.13"
-EZIG_MAX_EXCLUSIVE="0.14"
-
-DEPEND="
-	app-arch/zstd
-	sys-libs/ncurses:=[unicode(+)]
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	|| ( dev-lang/zig:${EZIG_MIN} dev-lang/zig-bin:${EZIG_MIN} )
-	virtual/pkgconfig
-	verify-sig? ( sec-keys/openpgp-keys-yorhel )
-"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/yoranheling.asc
-
-# see https://github.com/ziglang/zig/issues/3382
-# For now, Zig doesn't support CFLAGS/LDFLAGS/etc.
-QA_FLAGS_IGNORED="usr/bin/ncdu"
-
-DOCS=( "README.md" "ChangeLog" )
-
-# Many thanks to Florian Schmaus (Flowdalic)!
-# Adapted from https://github.com/gentoo/gentoo/pull/28986
-# Set the EZIG environment variable.
-zig-set_EZIG() {
-	[[ -n ${EZIG} ]] && return
-
-	if [[ -n ${EZIG_OVERWRITE} ]]; then
-		export EZIG="${EZIG_OVERWRITE}"
-		return
-	fi
-
-	local candidate selected selected_ver ver
-
-	for candidate in "${BROOT}"/usr/bin/zig-*; do
-		if [[ ! -L ${candidate} || ${candidate} != */zig?(-bin)-+([0-9.]) ]]; then
-			continue
-		fi
-
-		ver=${candidate##*-}
-
-		if [[ -n ${EZIG_EXACT_VER} ]]; then
-			ver_test "${ver}" -ne "${EZIG_EXACT_VER}" && continue
-
-			selected="${candidate}"
-			selected_ver="${ver}"
-			break
-		fi
-
-		if [[ -n ${EZIG_MIN} ]] \
-			   && ver_test "${ver}" -lt "${EZIG_MIN}"; then
-			# Candidate does not satisfy EZIG_MIN condition.
-			continue
-		fi
-
-		if [[ -n ${EZIG_MAX_EXCLUSIVE} ]] \
-			   && ver_test "${ver}" -ge "${EZIG_MAX_EXCLUSIVE}"; then
-			# Candidate does not satisfy EZIG_MAX_EXCLUSIVE condition.
-			continue
-		fi
-
-		if [[ -n ${selected_ver} ]] \
-			   && ver_test "${selected_ver}" -gt "${ver}"; then
-			# Candidate is older than the currently selected candidate.
-			continue
-		fi
-
-		selected="${candidate}"
-		selected_ver="${ver}"
-	done
-
-	if [[ -z ${selected} ]]; then
-		die "Could not find (suitable) zig installation in ${BROOT}/usr/bin"
-	fi
-
-	export EZIG="${selected}"
-	export EZIG_VER="${selected_ver}"
-}
-
-# Invoke zig with the optionally provided arguments.
-ezig() {
-	zig-set_EZIG
-
-	# Unfortunately, we cannot add more args here, since syntax is different
-	# for every subcommands. Yes, even target/cpu :( f.i. :
-	# -target/-mcpu for zig build-exe vs -Dtarget/-Dcpu for zig build-
-	# -OReleaseSafe for zig build-exe vs -DReleaseSafe for zig build
-	# (or even none, if hardcoded by upstream so choice is -Drelease=true/false)
-	# Ofc we can patch this, but still...
-
-	edo "${EZIG}" "${@}"
-}
-
-src_unpack() {
-	if use verify-sig; then
-		verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc}
-	fi
-	default
-}
-
-src_configure() {
-	zig-set_EZIG
-	export ZIG=${EZIG}
-}
-
-src_test() {
-	ezig build test --release=fast -Dstrip
-}
-
-src_install() {
-	emake PREFIX="${ED}"/usr install
-	einstalldocs
-}
diff --git a/sys-fs/unionfs-fuse/Manifest b/sys-fs/unionfs-fuse/Manifest
index 94592914575d..89614933eaec 100644
--- a/sys-fs/unionfs-fuse/Manifest
+++ b/sys-fs/unionfs-fuse/Manifest
@@ -1,6 +1,8 @@
 DIST unionfs-fuse-3.4.tar.gz 54122 BLAKE2B 8d578a1bd88814acf5e2d437b06a5f400f38e61ea7c998fe38bb7ca536c9092f07872c4b4ccffc9db834eb8430f3e98c543a66920afab2b2371451c17c247d2c SHA512 fb719c8548ab1fa43f236d5c3207d7e8e7a7dc45efed453e447e29452a7c4d03483c84b00fd615bac115781b333c8171d811b87a0227172010a2ab34224150f7
 DIST unionfs-fuse-3.5.tar.gz 54906 BLAKE2B e9fb236fda184766affec0640127d5d2ba4c9f964e8882570f069f83fb8f35b551f3198dd4f252242287bb92a5ddea396f62975d1ecf5b9b002fe0a7fe9c85a8 SHA512 4f9d08a9ac7f374f15aa31bf2d8cc5e37b35f9a63bcbba50c6d805fb66ea019737b4aa2236b425317e638b6275659c4260ff8e1fecdee038079dc64797ab6013
+DIST unionfs-fuse-3.6.tar.gz 56360 BLAKE2B be69579d141c05c4fa0f5350e17a35e40884129c84f844f79055608ae1b7652384fe0d8c49c7c5c035e8818b1f341a2f4af395ffa0924e7f79bfad55ca095adb SHA512 0edc9a4f55236a997bb3d8742b77003201a9d036665df903c8337ced0394e2f0bea3025dbace1f881838fa7699890b7bc93861217e26d27ff8725452e36699cc
 EBUILD unionfs-fuse-3.4-r1.ebuild 1025 BLAKE2B 3494e617dea6d62aa927db8c6adf0d8a0cf1714a200e66feb8a0505a23d75e7491c9872cd997247001471ca0f5a6f2642ba494acbf59f70cca7cfba2825376e2 SHA512 8e659c99da89ed545fb05b69cfd4ddd3f9565078ec2356bf4a6a3d5632edd02dc0d8b2253b6ca99cc11d908ef9183a56dd217dd44da614debab28c0344c371a5
 EBUILD unionfs-fuse-3.5.ebuild 1025 BLAKE2B 4f8f3a7c2c8263e9f95abe22387cc75d4ffc07a5de3d07871f1abff06321d2e89e5fe2dd834033ec51183211f237486ce86add0f7c836238411770616cd3a5a6 SHA512 80c94677072203aee3783f4800353ece2a6a235eea2f10c755c64c1ceba2fbc9fddd890fa1eaf0ff3b62c7506cae13ee80b535ab283e06e6629fe597a141c61f
+EBUILD unionfs-fuse-3.6.ebuild 1025 BLAKE2B eadc52185d4d2f0d9c4659214fd13cbfa6776f5f6ef0dab7a0e2907c1c09f6b3248a3259c0b1034c98cfc95f86ff121be665182b13466f0d5323658fcb1fd2b7 SHA512 c546f0635683658750dc52b4570f2d2c9a021318dc8be753df887e3d4a2212ff822e7e117348b044a7dd8ca1310decb8fa7f1a773bd0183ac07228747f0c0907
 EBUILD unionfs-fuse-9999.ebuild 978 BLAKE2B 1cf37386909950bdabffbabd242cbd3a13ce22ef3d6957e181578d143f226a496152cc4d62ed8cf2cd9b8100eb44f8a56cdd962827731c0b9e7e612ddc2b742c SHA512 93e70f656eacf2e6b3bae5ac15b434dd1845fd1415d3a05863b7fe7aea6b1ee75f57c6ae4924144ccc59e41e012e9e67fbeb7299f7c95fb952a62c1b9fc98886
 MISC metadata.xml 337 BLAKE2B 709342431554e98878806adef0d73e755defdf429a6541b42897f35ffab2764fa895365fed84a5c2a8437ddd5c386b4a51809550e1175eae8afae24d225b59cd SHA512 841cf1eae96b3ccafd75a5fbff6d7fba5e32bf9ab11db352f19b37adcfae30ddcaaa094d9bd4f5d10427f2f2d9c62e2c1454c3999141b64fa3df596c726396c7
diff --git a/sys-fs/unionfs-fuse/unionfs-fuse-3.6.ebuild b/sys-fs/unionfs-fuse/unionfs-fuse-3.6.ebuild
new file mode 100644
index 000000000000..1b3359d03bc6
--- /dev/null
+++ b/sys-fs/unionfs-fuse/unionfs-fuse-3.6.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+PYTHON_COMPAT=( python3_{9..12} )
+inherit python-any-r1 toolchain-funcs
+
+DESCRIPTION="Self-syncing tree-merging file system based on FUSE"
+HOMEPAGE="https://github.com/rpodgorny/unionfs-fuse"
+SRC_URI="https://github.com/rpodgorny/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="sys-fs/fuse:3"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	test? (
+		$(python_gen_any_dep 'dev-python/pytest[${PYTHON_USEDEP}]')
+	)
+"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+python_check_deps() {
+	use test || return 0
+	python_has_version "dev-python/pytest[${PYTHON_USEDEP}]"
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)" CC="$(tc-getCC)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
+}
+
+src_test() {
+	[[ -e /dev/fuse ]] || return 0
+	addwrite /dev/fuse
+	pytest -vv || die "Tests fail with ${EPYTHON}"
+}
diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index d4f889c41bfd..f3de35f53c8a 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -15,13 +15,16 @@ DIST zfs-2.3.0-rc3.tar.gz 33897910 BLAKE2B 518e2c56130a71d4c35f27328184e882815e2
 DIST zfs-2.3.0-rc3.tar.gz.asc 195 BLAKE2B 34685869cb8d4f911b3ce0a5098411ce4cb346310564b7ad5fbe9cfc50a3bbe7665c8daa36384b2d5f3ee1dad4b98d6d5bad5a6b8e2f45da35354428853f748d SHA512 1f32119b24c703dd5dbdcce63ddc97cd24f2052522cf1f2f9a4228691d0db7c136262d98b38f2d795a4edfce1d25b423c5bc4f65dbc008bd12f64acc24f3406e
 DIST zfs-2.3.0-rc4.tar.gz 33899889 BLAKE2B 97aabe9c020ab496e6fe621ecb34fd33b70b786664aee0ebdc1d9d8b0d8027bb092354451c882bf0a2954967414420b33b081a7302a4805dcf2e04a584b81463 SHA512 77bb0b8f9d8995edfc7ebb298c6b0a0834e89cd58410d8d4bc4e7f04ce04e26d486e9d0ce23dd22e74cff8e9a9e827ca9d3549885045265f8b17638e68f35f0f
 DIST zfs-2.3.0-rc4.tar.gz.asc 195 BLAKE2B 8c1b104c7cf88bc0415d13e4b4d7f21ec5d35722b09e977aa240d842cad36f51d1ae84fbb03d51e3408b7c1a427d56658b90e53109d1e3c6921ae772c256f122 SHA512 a0e74bbcc1062c7196e6e67c77175456ae995159b22c788c5f4c3026dfde662cfb396677b3aa46628576504bc38f374a191dec4ccd55c2b41685be408067b9ee
+DIST zfs-2.3.0-rc5.tar.gz 33907372 BLAKE2B 271e6f7e554e3b94d26edac2c53b12f1217013884fd74b3906107c34a4a8ffbfcee75295d05f50f4a13ba0f9368d7e2a8c86dae75bb73191d136ac9c3b92c375 SHA512 ea69909f70f2a5d4b2e3b6e5be61d224504f8936045372bb2d63279e2a051e53812b093fafcad09083925201b9ba940e9327f9d68d1754bf914b4cea5aa5090b
+DIST zfs-2.3.0-rc5.tar.gz.asc 195 BLAKE2B 9abacfa95552837cac092a9e207cf56e4224dc24c1015c289a49d19f4173bcc1781b6b118bd89b4c4c89060ace5955447aaa96228266bcc77232fdf5c0037e20 SHA512 76c5dc000440b0a90e3bcb0ef0de61153ea80f2d9e1798475a25234be407f061448dbfc7b94813debda696caf323539e08b43651c7eeff507dc395d2c770ffc7
 EBUILD zfs-kmod-2.1.15.ebuild 4188 BLAKE2B 5c8a646f0a674f6caf6fb65bcd785af9eb26c47261e764242dcac865f5280c9b6c47ae1f971d8d428c4e712ed75cfd0085e9af302cf2dd2d0d1d1e6e44f1fa71 SHA512 bb60b68a6a9c12dc9064cc831742de64db9bb743134edc0b868f6394e85e39d067915d940580f95ec656d31e46e0771a8fd983fb157dae96e3c2bbbb33ec0901
 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.6.ebuild 5524 BLAKE2B ed0c31e914a16da3bc691ec4658dad79b0b17148fb73cf6a1720c55c4ef74b167fdcb18201588f9b39d0c662d58d8f752f57ef6cc2ffdc60d96df3e9889ddd9a SHA512 5d1b24d46505e9d4964b7665351f96b1953ccceadb8d76c32f8efe7ea565aa880e9d4920928f40ebe5d58d10ea10b9656a89934c04ceaca012ab924d5a46741a
 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-2.3.0_rc4.ebuild 5527 BLAKE2B 6c05385c4a5201b4c26acbc9019c33a446922e677f5ff1e071e4f5dda9f76656b22f267b8d98c92cf745ac9c389929b9f0b6364a7614d4d902969b2b89c764f9 SHA512 6a46a6769f03c98426f6f147e519fa21ab9fab1b25e78c322a00a03f7aa414ac327b605ad2c49a290aba070db26dd8be4d688e5f0bd5768cc0d0573e975b46a4
+EBUILD zfs-kmod-2.3.0_rc5.ebuild 5527 BLAKE2B 423d19cfc293a587245f0ae0e171fc2c6adb49a53c505635fc3658903eaf2f34eabcb44f3273642d2b240cc9308f8a1dd487302f0493d4d16a9f9d016e11fc86 SHA512 ac0b46c176a8ab94b8d642ae1d21052299f09a29dd6d6640e97ac5275c16232a491451686f14a1a3cb3ee66b4cf019c5938ce227f64d889f5c0f2785794c215c
 EBUILD zfs-kmod-9999.ebuild 5527 BLAKE2B 6c05385c4a5201b4c26acbc9019c33a446922e677f5ff1e071e4f5dda9f76656b22f267b8d98c92cf745ac9c389929b9f0b6364a7614d4d902969b2b89c764f9 SHA512 6a46a6769f03c98426f6f147e519fa21ab9fab1b25e78c322a00a03f7aa414ac327b605ad2c49a290aba070db26dd8be4d688e5f0bd5768cc0d0573e975b46a4
 MISC metadata.xml 664 BLAKE2B 50e33d5791fd756ae4566052ecd6d8b1b395f8390b4cbc10c3b32bfc12f0a414f4080bf4102091f0920369f7999f2f94022fd526703ee8e73dc948c1f9d28432 SHA512 dca8e09500fe0e20f11b10df22a61ca36c99b6b3a08c465ea011d921b25f5891be3abaa5e6dbda1a52dbbfad69d1c8bf9fc69f71b3ef73cac428015641aa52d2
diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.2.6.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.2.6.ebuild
index 8f1c08d298b6..faf0082b07eb 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-2.2.6.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.2.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -31,7 +31,7 @@ else
 	ZFS_KERNEL_DEP="${ZFS_KERNEL_DEP%%.*}.$(( ${ZFS_KERNEL_DEP##*.} + 1))"
 
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~sparc"
+		KEYWORDS="amd64 arm64 ~loong ppc64 ~riscv ~sparc"
 	fi
 fi
 
diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.3.0_rc5.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.3.0_rc5.ebuild
new file mode 100644
index 000000000000..435d8a40d273
--- /dev/null
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.3.0_rc5.ebuild
@@ -0,0 +1,207 @@
+# Copyright 1999-2025 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 5626cd31decc..54fc4b41381b 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/Manifest
@@ -18,13 +18,16 @@ DIST zfs-2.3.0-rc3.tar.gz 33897910 BLAKE2B 518e2c56130a71d4c35f27328184e882815e2
 DIST zfs-2.3.0-rc3.tar.gz.asc 195 BLAKE2B 34685869cb8d4f911b3ce0a5098411ce4cb346310564b7ad5fbe9cfc50a3bbe7665c8daa36384b2d5f3ee1dad4b98d6d5bad5a6b8e2f45da35354428853f748d SHA512 1f32119b24c703dd5dbdcce63ddc97cd24f2052522cf1f2f9a4228691d0db7c136262d98b38f2d795a4edfce1d25b423c5bc4f65dbc008bd12f64acc24f3406e
 DIST zfs-2.3.0-rc4.tar.gz 33899889 BLAKE2B 97aabe9c020ab496e6fe621ecb34fd33b70b786664aee0ebdc1d9d8b0d8027bb092354451c882bf0a2954967414420b33b081a7302a4805dcf2e04a584b81463 SHA512 77bb0b8f9d8995edfc7ebb298c6b0a0834e89cd58410d8d4bc4e7f04ce04e26d486e9d0ce23dd22e74cff8e9a9e827ca9d3549885045265f8b17638e68f35f0f
 DIST zfs-2.3.0-rc4.tar.gz.asc 195 BLAKE2B 8c1b104c7cf88bc0415d13e4b4d7f21ec5d35722b09e977aa240d842cad36f51d1ae84fbb03d51e3408b7c1a427d56658b90e53109d1e3c6921ae772c256f122 SHA512 a0e74bbcc1062c7196e6e67c77175456ae995159b22c788c5f4c3026dfde662cfb396677b3aa46628576504bc38f374a191dec4ccd55c2b41685be408067b9ee
+DIST zfs-2.3.0-rc5.tar.gz 33907372 BLAKE2B 271e6f7e554e3b94d26edac2c53b12f1217013884fd74b3906107c34a4a8ffbfcee75295d05f50f4a13ba0f9368d7e2a8c86dae75bb73191d136ac9c3b92c375 SHA512 ea69909f70f2a5d4b2e3b6e5be61d224504f8936045372bb2d63279e2a051e53812b093fafcad09083925201b9ba940e9327f9d68d1754bf914b4cea5aa5090b
+DIST zfs-2.3.0-rc5.tar.gz.asc 195 BLAKE2B 9abacfa95552837cac092a9e207cf56e4224dc24c1015c289a49d19f4173bcc1781b6b118bd89b4c4c89060ace5955447aaa96228266bcc77232fdf5c0037e20 SHA512 76c5dc000440b0a90e3bcb0ef0de61153ea80f2d9e1798475a25234be407f061448dbfc7b94813debda696caf323539e08b43651c7eeff507dc395d2c770ffc7
 EBUILD zfs-2.1.15.ebuild 8907 BLAKE2B fd489ab42d59038c4621177e32301694fae72c402ea0b1cbd17880b9216a637234f2bdff0e689574ed80c957466039f2eb51c91f711efdc7133782560b931531 SHA512 d8fb2785d452dd626854ae72435004d639dae16ab0df1e4f70d99982ffaf248e79a7520604b22b66aba79b792a8dd49501b02d2bf84da9fb3282105efe58b6a3
 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.6.ebuild 8913 BLAKE2B 951a7f8bdb0d42f6e5e46f3fc3f067cdc7dc5d14398e6e658c4a0d3eb26c646e212935c2d6485741667421fea27ce95e86cd63802990b1d7f58bd81fcec884c7 SHA512 372b1e26894b20891aa7fb2f84c5db45dee8a2c145ad1ee8955a0cd7fecc35460222236423e1387c1d9abaf719315be5e2658f6dd3f912caf6a742b437bf0513
 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-2.3.0_rc4.ebuild 8846 BLAKE2B 089f870033b0e3c3d7477f4c4133a6d3dc1b42338cf837b26dc2da8dd4c5ab7d09e524b66a701733e4560505e626e0b03d34ad95b42fe1ddeeb998cfc81a6617 SHA512 4cb3a58edc64102635ad94210ff52fcf009e00e6e855a7111da63e6d25f4cba76fd21c1b571eb919dbbc34f250bb95eae96fc5a39e551b8877cd5b8e0b8ec5f4
+EBUILD zfs-2.3.0_rc5.ebuild 8846 BLAKE2B 80fd06e847c2fc0f8fc435be51803f823507106a86890541bde59b2c61922a933102d670d7951e81b6bb1121f0ed6905ff465e02832c3f584ff70505ec5c954f SHA512 f70729a0304e6b92709b267f9efaf29d73757315f1856a1b8ab347e0742ae39b83b178900c12f59440ea733372571f4ca6ea5effd8bb7f41236a56cbfa778c2a
 EBUILD zfs-9999.ebuild 8846 BLAKE2B 089f870033b0e3c3d7477f4c4133a6d3dc1b42338cf837b26dc2da8dd4c5ab7d09e524b66a701733e4560505e626e0b03d34ad95b42fe1ddeeb998cfc81a6617 SHA512 4cb3a58edc64102635ad94210ff52fcf009e00e6e855a7111da63e6d25f4cba76fd21c1b571eb919dbbc34f250bb95eae96fc5a39e551b8877cd5b8e0b8ec5f4
 MISC metadata.xml 2093 BLAKE2B 40f9f693751748deab32cd78bb919483e37d35da74ecaa28b31a183807c25c6a7022226e761dc27f895b142274bd9920e361f45a50b98bcf2a4b701d9e67fb94 SHA512 63d91d33151eea801c854246ea2c4640ecd432e74668b8f4f6ea22d4ae61823848a1608e9ee25821ef463f5f5e8e7e1c8d2aae4f1fee492ea4112214d2d6d1ed
diff --git a/sys-fs/zfs/zfs-2.2.6.ebuild b/sys-fs/zfs/zfs-2.2.6.ebuild
index 5264247e69af..70455ee1af6a 100644
--- a/sys-fs/zfs/zfs-2.2.6.ebuild
+++ b/sys-fs/zfs/zfs-2.2.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -25,7 +25,7 @@ else
 	S="${WORKDIR}/${MY_P}"
 
 	if [[ ${PV} != *_rc* ]]; then
-		KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~sparc"
+		KEYWORDS="amd64 arm64 ~loong ppc64 ~riscv ~sparc"
 	fi
 fi
 
diff --git a/sys-fs/zfs/zfs-2.3.0_rc5.ebuild b/sys-fs/zfs/zfs-2.3.0_rc5.ebuild
new file mode 100644
index 000000000000..48dcd8358c6d
--- /dev/null
+++ b/sys-fs/zfs/zfs-2.3.0_rc5.ebuild
@@ -0,0 +1,308 @@
+# Copyright 1999-2025 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/6"
+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
+)
+
+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
+}