diff --git a/net-fs/ncpfs-modules/Manifest b/net-fs/ncpfs-modules/Manifest
index 64c26e76..2e2b424e 100644
--- a/net-fs/ncpfs-modules/Manifest
+++ b/net-fs/ncpfs-modules/Manifest
@@ -1 +1 @@
-EBUILD ncpfs-modules-9999.ebuild 1558 BLAKE2B 0720aa739a5d10961dc4dd0a320d246baf48825c43b6e8b5828f4bde964f1d937709b7d70a43fad67db63c3605e5ec5081ae0c5121cead1034f29d98613a1ac6 SHA512 80ef36b5443d0871961103a3fe4a36d38188c35b7082b519cf00ea0ebbb2c75d81edffbd79c5fc175ca9f1bd8c0ee70cc21ca55b48c0fc9cbdcb7c05881c9eeb
+EBUILD ncpfs-modules-9999.ebuild 1655 BLAKE2B 1f4f67119b1505fe5bb080ec868bcd255f591ddfe4b1ac14295a4093e9cd364207bb960cf94736316a2a782e8caad3a90517dc8a7a303a359e27ec5f4acf420f SHA512 773427fc68334594aeb428c64b840bc3009182c06d7299d2d0e31144fc141684cfed1f65e61cfe9a5d8e5dedad65f1040b407b48d6f3a3b71942d97e315e1212
diff --git a/net-fs/ncpfs-modules/ncpfs-modules-9999.ebuild b/net-fs/ncpfs-modules/ncpfs-modules-9999.ebuild
index 6aa033cf..b6817d51 100644
--- a/net-fs/ncpfs-modules/ncpfs-modules-9999.ebuild
+++ b/net-fs/ncpfs-modules/ncpfs-modules-9999.ebuild
@@ -1,77 +1,82 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit git-r3 linux-info linux-mod
+inherit git-r3 linux-info linux-mod-r1
 
 DESCRIPTION="ncpfs kernel module for Linux 4.18+"
 HOMEPAGE="https://github.com/EnzephaloN/ncpfs-module"
 EGIT_REPO_URI="https://github.com/EnzephaloN/ncpfs-module.git"
-#EGIT_REPO_URI="https://github.com/hundertzwei/ncpfs-module.git"
+# EGIT_REPO_URI="https://github.com/hundertzwei/ncpfs-module.git"
+KEYWORDS="~amd64"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
 
-BUILD_TARGETS="all"
 CONFIG_CHECK="NET"
-MODULE_NAMES="ncpfs(ncpfs:${S})"
 
+pkg_setup() {
+    linux-mod-r1_pkg_setup
+}
 
 src_unpack() {
-	if kernel_is gt 4 18 0; then
-	    EGIT_BRANCH="kernel_4.19"
-	fi
-	if kernel_is gt 4 20 0; then
-	    EGIT_BRANCH="kernel_4.20"
-	fi
-	if kernel_is gt 5 2 0; then
-	    EGIT_BRANCH="kernel_5.2"
-	fi
-	if kernel_is gt 5 6 0; then
-	    EGIT_BRANCH="kernel_5.6"
-	fi
-	if kernel_is gt 5 12 0; then
-	    EGIT_BRANCH="kernel_5.12"
-	fi
-	if kernel_is gt 5 15 0; then
-	    EGIT_BRANCH="kernel_5.15"
-	fi
-	if kernel_is gt 5 19 0; then
-	    EGIT_BRANCH="kernel_5.19"
-	fi
-	if kernel_is gt 6 3 0; then
-	    EGIT_BRANCH="kernel_6.3"
-	fi
-	if kernel_is gt 6 5 0; then
-	    EGIT_BRANCH="kernel_6.5"
-	fi
-	if kernel_is gt 6 6 0; then
-	    EGIT_BRANCH="kernel_6.6"
-	fi
-	if kernel_is gt 6 8 0; then
-	    EGIT_BRANCH="kernel_6.8"
-	fi
-	if kernel_is gt 6 12 0; then
-	    EGIT_BRANCH="kernel_6.12"
-	fi
-	if kernel_is gt 6 14 0; then
-	    EGIT_BRANCH="kernel_6.14"
-	fi
-	if kernel_is gt 6 16 0; then
-	    EGIT_BRANCH="master"
-	fi
+    if kernel_is gt 4 18 0; then
+	EGIT_BRANCH="kernel_4.19"
+    fi
+    if kernel_is gt 4 20 0; then
+	EGIT_BRANCH="kernel_4.20"
+    fi
+    if kernel_is gt 5 2 0; then
+	EGIT_BRANCH="kernel_5.2"
+    fi
+    if kernel_is gt 5 6 0; then
+	EGIT_BRANCH="kernel_5.6"
+    fi
+    if kernel_is gt 5 12 0; then
+	EGIT_BRANCH="kernel_5.12"
+    fi
+    if kernel_is gt 5 15 0; then
+	EGIT_BRANCH="kernel_5.15"
+    fi
+    if kernel_is gt 5 19 0; then
+	EGIT_BRANCH="kernel_5.19"
+    fi
+    if kernel_is gt 6 3 0; then
+	EGIT_BRANCH="kernel_6.3"
+    fi
+    if kernel_is gt 6 5 0; then
+	EGIT_BRANCH="kernel_6.5"
+    fi
+    if kernel_is gt 6 6 0; then
+	EGIT_BRANCH="kernel_6.6"
+    fi
+    if kernel_is gt 6 8 0; then
+	EGIT_BRANCH="kernel_6.8"
+    fi
+    if kernel_is gt 6 12 0; then
+	EGIT_BRANCH="kernel_6.12"
+    fi
+    if kernel_is gt 6 14 0; then
+	EGIT_BRANCH="kernel_6.14"
+    fi
+    if kernel_is gt 6 16 0; then
+	EGIT_BRANCH="master"
+    fi
 
-	git-r3_src_unpack
+    git-r3_src_unpack
 }
 
 src_compile() {
-	BUILD_PARAMS="KDIR=${KV_OUT_DIR} M=${S}"
+    local modlist=(
+	ncpfs=ncpfs:${S}:${S}:all
+    )
 
-	linux-mod_src_compile
+    local modargs=( KDIR=${KV_OUT_DIR} M=${S} )
+
+    linux-mod-r1_src_compile
 }
 
 src_install() {
-	linux-mod_src_install
+    linux-mod-r1_src_install
 }
diff --git a/net-misc/ipx-modules/Manifest b/net-misc/ipx-modules/Manifest
index 8e05b36b..b9c90e45 100644
--- a/net-misc/ipx-modules/Manifest
+++ b/net-misc/ipx-modules/Manifest
@@ -1 +1 @@
-EBUILD ipx-modules-9999.ebuild 581 BLAKE2B d3b2acd01d7513dd3b89830bc6067cb54a48c25c5f2c06384baa2042233e206975cc8c089120734ea606582b45b99fc85d609dcc33901885d7362c450b1a5799 SHA512 9d89442c1d7bc26e98113cfce194e282cc3abbaad926f1c8eb2986dad3264ad3caae2e7fbb3cb927b74df2d170bc4f4d25d6521e00d2807578f86f7c28ff9b90
+EBUILD ipx-modules-9999.ebuild 581 BLAKE2B 73b161cf21d2988ba81e574a35f6ae9ce42fc8f9f6693d82cf084ccf6eec7fa679ba8a3e416d5ce09600ec9a738891f70cb5ca09c92be2befe31a64a6e4252b2 SHA512 6a6beb465fbf32203ec707ce9d981618ca610f68cfad59515a0b66833f63da0667d196cae50deacd6b1cc2ebce2cae83cfcfc363e460873ffd91e5f782537de9
diff --git a/net-misc/ipx-modules/ipx-modules-9999.ebuild b/net-misc/ipx-modules/ipx-modules-9999.ebuild
index 5a0acf88..5c04de82 100644
--- a/net-misc/ipx-modules/ipx-modules-9999.ebuild
+++ b/net-misc/ipx-modules/ipx-modules-9999.ebuild
@@ -22,7 +22,7 @@ src_compile() {
 	ipx=ipx:${S}:${S}:build
     )
 
-    KV_EXTRA_MAKE+=" KERNELDIR=${KV_OUT_DIR} M=${S}"
+    local modargs=( KERNELDIR=${KV_OUT_DIR} M=${S} )
 
     linux-mod-r1_src_compile
 }