3 files changed, 27 insertions, 52 deletions
diff --git a/sys-cluster/knem/Manifest b/sys-cluster/knem/Manifest
index cfae2d5c4440..97a064153ae1 100644
--- a/sys-cluster/knem/Manifest
+++ b/sys-cluster/knem/Manifest
@@ -1,5 +1,5 @@
 AUX 45-knem.rules 28 BLAKE2B 4f7eb2b4c84bc786998ac8ad610626b6ca3e384777aeecd7bb18fb657ff095f7311670bb388d6e7c5f1da944428d6d088bd65d333d27cf67f3d1d532354aaaf6 SHA512 fc819a12ad7432cbf08450ebc36b469402753d8d363d72a46b71efb916391d320591eac0be9498a37a7bbc5ebe1b2725a2cbf37c7c69ed7d5c6e1ccf9ce0e51b
-DIST knem-1.1.4.tar.gz 336148 BLAKE2B e7273040c563c63e5e5c1a4a6b822a4b34b6fbb7214a7a37b4ff06f23aa47fe80c55ed1781ce85d974ed7e53059b509db98a94baaa7bddfc8860d503cf89869d SHA512 4f142a910ac51a590952aa1f36010fc2a1361162a0d5fd98f47d1c90dedbb293d56bd990bded5d4ec91fcc8df3fa3bcf0d126651b5868c557ffb9f3a588cb948
-EBUILD knem-1.1.4.ebuild 1700 BLAKE2B 2f3a58da4ce9cf41126533e2d4f575c3b3b7f9153ea019fbf284b816ee096006c657984b8bf214be027b03cd4ab505ce260f321e6bfe20a0e1973820c1e9444c SHA512 a25ee03c40cd49975d171c173cdb1a8cdaf2d3306dee745731b4900b90b6b46a8859d1b289edcd2007efe614a58b2c8aeb8a3fd579383b34ab625eb178dcbc5f
-EBUILD knem-9999.ebuild 1689 BLAKE2B a3284ba6a06d6a365e6f6132a6944f01387c2099900eec2cd7f72737fa3ccb7a6221648e8d6c80b41a438121b64d157e8c26fee7a6652f98f3c70ba76ff76776 SHA512 69fbeb500f0b1aec968c1800d78af94180dbff674e4241a32402d41539e8e1a07b01c383436ed93e07b751f06969f06695433308faa5fa41f87712d5e98eabd5
+DIST knem-1.1.4_p20250126.tar.xz 63764 BLAKE2B 843fd33ec353c56b73843ebe9e4a5d139925fc37c597c5d81e2f97baad405f07eeb8492e6651cb0fbbd533c600c559bdf3b40f55daabb1a1ecbf7705744a5d1a SHA512 1530c006312e00fcbbb36a8f9490640572c960b7e11d4e30bd2768183bc454f2cc43c58e8e0a18f48bc87c23b094398567c2a84426c8e61b477e1701a4cd2db5
+EBUILD knem-1.1.4_p20250126.ebuild 1428 BLAKE2B 809da631c64d5560dcee9fab93924bbd07e776c2d330bb85f4c41d39693075c656afa57e7ab8e111b03cf350bb48add9cfc86cdb020ed9831eac3c0d2f7ff927 SHA512 b371b452bb585b06050ef4d4736359a4fb8e8f6fbaf2901002dd242c7dce50f0277adaabcf7c8953d44f31d939128be4b9dd1c183502fe1ae7925f6b347c7391
+EBUILD knem-9999.ebuild 1394 BLAKE2B 2d36e28197e78392958c04a3db12055869f04de81ce33706f7dd93522d004cff463f8d968125edc2108cddb5302fab499f210e9144bd8b191db9c0f5fa856689 SHA512 96bd0efd9b94f90ee4ae1a3517985ec0ffb1573f79daac7506653d9bfebbd0374ec8740d46481df0a9b8ed6fbe893d3e5b57f7e94236b3eaa016f571cb247116
 MISC metadata.xml 366 BLAKE2B 88ab7530ca5714d50aaad9711cc233ec140b70cfb4600cf6568d930d1215180fea671a6c47ae7fd33c71a7a880faf4a4f79b8d6585a4f34bced6a3a4b3ec042a SHA512 91614f11fdbbe9a06b188097a6c7c5c411c926734166c43c1dd1529375182270406a0889d9e7033660c63d662142a84882c69e60f785d3562ffd288c0a344dae
diff --git a/sys-cluster/knem/knem-1.1.4.ebuild b/sys-cluster/knem/knem-1.1.4_p20250126.ebuild
index a5299c2ab493..cbb30837d19e 100644
--- a/sys-cluster/knem/knem-1.1.4.ebuild
+++ b/sys-cluster/knem/knem-1.1.4_p20250126.ebuild
@@ -1,22 +1,18 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
 
-inherit autotools linux-mod linux-info toolchain-funcs udev
+MODULES_OPTIONAL_IUSE=+modules
+inherit autotools linux-mod-r1 toolchain-funcs udev
 
 DESCRIPTION="High-Performance Intra-Node MPI Communication"
-HOMEPAGE="https://knem.gforge.inria.fr/"
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://gforge.inria.fr/git/knem/knem.git"
-	inherit git-r3
-else
-	SRC_URI="https://gitlab.inria.fr/knem/knem/uploads/4a43e3eb860cda2bbd5bf5c7c04a24b6/${P}.tar.gz"
-	KEYWORDS="~amd64 ~riscv ~x86"
-fi
-
+HOMEPAGE="https://knem.gitlabpages.inria.fr/"
+SRC_URI="https://dev.gentoo.org/~mpagano/dist/${PN}/${P}.tar.xz"
 LICENSE="GPL-2 LGPL-2"
+
 SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
 IUSE="debug modules"
 
 DEPEND="
@@ -26,15 +22,11 @@ RDEPEND="
 		sys-apps/hwloc:=
 		sys-apps/kmod[tools]"
 
-MODULE_NAMES="knem(misc:${S}/driver/linux)"
-BUILD_TARGETS="all"
-BUILD_PARAMS="KDIR=${KERNEL_DIR}"
-
 pkg_setup() {
 	linux-info_pkg_setup
 	CONFIG_CHECK="DMA_ENGINE"
 	check_extra_config
-	linux-mod_pkg_setup
+	linux-mod-r1_pkg_setup
 	ARCH="$(tc-arch-kernel)"
 	ABI="${KERNEL_ABI}"
 }
@@ -54,21 +46,16 @@ src_configure() {
 }
 
 src_compile() {
+	local modlist=( knem=misc:"${S}/driver/linux" )
 	default
-	if use modules; then
-		cd "${S}/driver/linux"
-		linux-mod_src_compile || die "failed to build driver"
-	fi
+	linux-mod-r1_src_compile || die "failed to build driver"
 }
 
 src_install() {
 	default
-	if use modules; then
-		cd "${S}/driver/linux"
-		linux-mod_src_install || die "failed to install driver"
-	fi
+	linux-mod-r1_src_install
 
-	# Drop funny unneded stuff
+	# Drop funny unneeded stuff
 	rm "${ED}/usr/sbin/knem_local_install" || die
 	rmdir "${ED}/usr/sbin" || die
 	# install udev rules
@@ -77,6 +64,7 @@ src_install() {
 }
 
 pkg_postinst() {
+	linux-mod-r1_pkg_postinst
 	udev_reload
 }
 
diff --git a/sys-cluster/knem/knem-9999.ebuild b/sys-cluster/knem/knem-9999.ebuild
index d0ff2cda6826..dcbdb36141b2 100644
--- a/sys-cluster/knem/knem-9999.ebuild
+++ b/sys-cluster/knem/knem-9999.ebuild
@@ -1,19 +1,14 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
 
-inherit autotools linux-mod linux-info toolchain-funcs udev
+MODULES_OPTIONAL_IUSE=+modules
+inherit autotools git-r3 linux-mod-r1 toolchain-funcs udev
 
 DESCRIPTION="High-Performance Intra-Node MPI Communication"
-HOMEPAGE="https://knem.gforge.inria.fr/"
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://gitlab.inria.fr/knem/knem.git"
-	inherit git-r3
-else
-	SRC_URI="https://gitlab.inria.fr/knem/knem/uploads/4a43e3eb860cda2bbd5bf5c7c04a24b6/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
+HOMEPAGE="https://knem.gitlabpages.inria.fr/"
+EGIT_REPO_URI="https://gitlab.inria.fr/knem/knem.git"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
@@ -26,15 +21,11 @@ RDEPEND="
 		sys-apps/hwloc:=
 		sys-apps/kmod[tools]"
 
-MODULE_NAMES="knem(misc:${S}/driver/linux)"
-BUILD_TARGETS="all"
-BUILD_PARAMS="KDIR=${KERNEL_DIR}"
-
 pkg_setup() {
 	linux-info_pkg_setup
 	CONFIG_CHECK="DMA_ENGINE"
 	check_extra_config
-	linux-mod_pkg_setup
+	linux-mod-r1_pkg_setup
 	ARCH="$(tc-arch-kernel)"
 	ABI="${KERNEL_ABI}"
 }
@@ -54,21 +45,16 @@ src_configure() {
 }
 
 src_compile() {
+	local modlist=( knem=misc:"${S}/driver/linux" )
 	default
-	if use modules; then
-		cd "${S}/driver/linux"
-		linux-mod_src_compile || die "failed to build driver"
-	fi
+	linux-mod-r1_src_compile || die "failed to build driver"
 }
 
 src_install() {
 	default
-	if use modules; then
-		cd "${S}/driver/linux"
-		linux-mod_src_install || die "failed to install driver"
-	fi
+	linux-mod-r1_src_install
 
-	# Drop funny unneded stuff
+	# Drop funny unneeded stuff
 	rm "${ED}/usr/sbin/knem_local_install" || die
 	rmdir "${ED}/usr/sbin" || die
 	# install udev rules
@@ -77,6 +63,7 @@ src_install() {
 }
 
 pkg_postinst() {
+	linux-mod-r1_pkg_postinst
 	udev_reload
 }