5 files changed, 16 insertions, 69 deletions
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 760a308aaf6d..fb23a15bb975 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/dkms/Manifest b/sys-kernel/dkms/Manifest
index 5e2d227e2939..59f58f2aef8b 100644
--- a/sys-kernel/dkms/Manifest
+++ b/sys-kernel/dkms/Manifest
@@ -1,10 +1,8 @@
-DIST dkms-3.1.4.tar.gz 100829 BLAKE2B 91e42c1ff31753cdfd60148de63527c77f97225312837d99ec4b17616349506fec89ced2da59f4afd28620b2e438c949837cd8f828143088e74dded94dfa42a0 SHA512 7f4f611c3ef4ee114adaece564437eeda40afd1e23e140fd76677ad7e50867763b512a56279172fafcf0411b6f5263c1ea1e1e6e651041f8a551e532dcd69639
-DIST dkms-3.1.5.tar.gz 103374 BLAKE2B 55099cb49d2fd7cd9b2ec0e8006c03e741172b56d840c9ddd906e1f46bafdd4fb333332c336a32acf1efbe21fca6fb70bb9120fd5bfb5255e7658802f32cf524 SHA512 b72d0b9590bdd3c4f08848ea419ccb4b46cece40120ced5dc5abe826e232ca1608c8bdb852a2544f8fb640f0e8210043e574826071d27753b48ee99462a29776
 DIST dkms-3.1.6.tar.gz 104856 BLAKE2B 6ca1e122286d11004f96aa073805e3c56409a7e49902d5a42fa8cd941b8aa51cd053374be67806ef1f7448cc84c788788a5aca733636ee7f7d316a24062fa73f SHA512 aec4673d4f352c6b78136557bb8596d9a4933539299b3ae03dd10c8f2192498d3077e650ca4a6a6762ef2f65633fb6b9ae86dda80670b162b5ff57eeefa30d8d
 DIST dkms-3.1.7.tar.gz 106391 BLAKE2B 8f82eecd17589596091862dcd1ef4143ef20ee22ce435170834543b7ae3995a04f03b2b007f0b4ba1bf1a7cd78fb568b341ed8c78c1301a39d8504a7babc6848 SHA512 2c0c71838130dc3972ffa83fc0a9d82c226b42d79d1d12c518d8f411c23ea9b0203da5aa72f1a4d4355f85c8d8569dd453418ff4b89dd8c7dd8e8d4ae20bb077
-EBUILD dkms-3.1.4.ebuild 1021 BLAKE2B b695485d0ceabb30c57ea8066c302ee3e9eef14f17e7acf5d95138af9866add674e31c1f222147075a446529f417db1e9aff90ae3b6d2fb0eda0612bebcc3083 SHA512 bdee3f62fe6ff894f7e2b26a25ed8655ec4fcaf90c73a24a9c44cf4db063f5a049a753ebe9fe2cca7927a6992d87a08fdcf81aa6bfbab017c1bb3ede324b382f
-EBUILD dkms-3.1.5.ebuild 1024 BLAKE2B bdde96ac31424bc9e7fc4b01d9814aa5752586eff11a00744a4ecb02a9fddbdaef3c1befbc0eecd6b61f5ae843aeef59a0455d1c5658bd6d024b21dd1406def0 SHA512 de3fd8ac8fffb9b7386c3c6244e69384297dfc9e0b1fbda7c4215bfbd74d5b8606dd259ae41407cf6cd58b4e5d266857cea54d395acf63a2b417f2b6e9949c66
-EBUILD dkms-3.1.6.ebuild 1140 BLAKE2B 78c5fe18b524e0ef7f860f697d854962f06902b24ee004cbe9331f6d42e21708ad1e046940e4832a134a75c046eb9d06c596fdee5f81af23e5fab1d80cded8bc SHA512 b86e89f348ded4e50b3eb60c6e9880b6696a7c29ccbb0c84876776af20b04d69f4aa63ac61ccf023e91c0bcc19211cd1b70181b9f627293cf9d2c7ff4b6d0ee4
+DIST dkms-3.1.8.tar.gz 107290 BLAKE2B 20bc841c27f555a9fafd2e21989f955e0e77947b16bee9d016585b2624d55c32db2984bf68c3f57ad82e4c86977b875f1736c924dda5134ee13e16d28a1cb2bc SHA512 4a31a4c08573a59977d7110ef63aabc1d7521eee6d0c2cfad76497070cd829d14d69b9288f594abbaf46afcadc615cad92b4993f425d38779fac554f9dfc216e
+EBUILD dkms-3.1.6.ebuild 1137 BLAKE2B 09b79893391147b0b9fe8ac5a47c50fc2d20a41c8560cff5a8d22e3df70127f8b54af4840e7a373c9732450f85f22a2204cbfd5e87dde75d3221276c663e4c20 SHA512 4bba80a16c7cfa32f795b49ed262980ea63e2be52074540ae526dc4a85714ccc87a9c04af88052775124d7dd995be916d9519d2908b9f27d47a9e0bc41f7fe82
 EBUILD dkms-3.1.7.ebuild 1140 BLAKE2B 78c5fe18b524e0ef7f860f697d854962f06902b24ee004cbe9331f6d42e21708ad1e046940e4832a134a75c046eb9d06c596fdee5f81af23e5fab1d80cded8bc SHA512 b86e89f348ded4e50b3eb60c6e9880b6696a7c29ccbb0c84876776af20b04d69f4aa63ac61ccf023e91c0bcc19211cd1b70181b9f627293cf9d2c7ff4b6d0ee4
+EBUILD dkms-3.1.8.ebuild 1140 BLAKE2B 78c5fe18b524e0ef7f860f697d854962f06902b24ee004cbe9331f6d42e21708ad1e046940e4832a134a75c046eb9d06c596fdee5f81af23e5fab1d80cded8bc SHA512 b86e89f348ded4e50b3eb60c6e9880b6696a7c29ccbb0c84876776af20b04d69f4aa63ac61ccf023e91c0bcc19211cd1b70181b9f627293cf9d2c7ff4b6d0ee4
 EBUILD dkms-9999.ebuild 1140 BLAKE2B 78c5fe18b524e0ef7f860f697d854962f06902b24ee004cbe9331f6d42e21708ad1e046940e4832a134a75c046eb9d06c596fdee5f81af23e5fab1d80cded8bc SHA512 b86e89f348ded4e50b3eb60c6e9880b6696a7c29ccbb0c84876776af20b04d69f4aa63ac61ccf023e91c0bcc19211cd1b70181b9f627293cf9d2c7ff4b6d0ee4
 MISC metadata.xml 1434 BLAKE2B cb34aa7e05b52bd63f860ab0de7adf4e430d8fe7fcb466cefef4a718625a6432e310d65554250cfb9c3914dc102612d2ec4e9cb5c7e8ce5408b50566e475897b SHA512 7132d501fdcb3e2f768032cef040bcf291f0fdc7fb8b448d765dee97b213c2303f2cc741cc648ac2786386e6c3cf2591083b971fd78d9293889dc62a9b0b11e0
diff --git a/sys-kernel/dkms/dkms-3.1.5.ebuild b/sys-kernel/dkms/dkms-3.1.5.ebuild
deleted file mode 100644
index b307c52fa653..000000000000
--- a/sys-kernel/dkms/dkms-3.1.5.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit linux-info optfeature
-
-DESCRIPTION="Dynamic Kernel Module Support"
-HOMEPAGE="https://github.com/dell/dkms"
-SRC_URI="https://github.com/dell/dkms/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-IUSE="systemd"
-
-RDEPEND="
-	sys-apps/kmod
-	virtual/linux-sources
-	systemd? ( sys-apps/systemd )
-"
-
-# Cannot work in the emerge sandbox
-RESTRICT="test"
-
-CONFIG_CHECK="~MODULES"
-
-src_compile() {
-	# Nothing to do here
-	return
-}
-
-src_test() {
-	chmod +x dkms || die
-	PATH="${PATH}:$(pwd)" ./run_test.sh || die "Tests failed"
-}
-
-src_install() {
-	if use systemd; then
-		emake install-redhat DESTDIR="${ED}" KCONF="/usr/lib/kernel"
-	else
-		emake install DESTDIR="${ED}" KCONF="/usr/lib/kernel"
-	fi
-
-	einstalldocs
-	keepdir /var/lib/dkms
-}
-
-pkg_postinst() {
-	optfeature "automatically running \"dkms autoinstall\" on each kernel installation" \
-		sys-kernel/installkernel
-}
diff --git a/sys-kernel/dkms/dkms-3.1.6.ebuild b/sys-kernel/dkms/dkms-3.1.6.ebuild
index 4f666a77733d..42c9182f4207 100644
--- a/sys-kernel/dkms/dkms-3.1.6.ebuild
+++ b/sys-kernel/dkms/dkms-3.1.6.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/dell/dkms"
 else
 	SRC_URI="https://github.com/dell/dkms/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 arm64 x86"
 fi
 
 DESCRIPTION="Dynamic Kernel Module Support"
diff --git a/sys-kernel/dkms/dkms-3.1.4.ebuild b/sys-kernel/dkms/dkms-3.1.8.ebuild
index da093f0614a8..4f666a77733d 100644
--- a/sys-kernel/dkms/dkms-3.1.4.ebuild
+++ b/sys-kernel/dkms/dkms-3.1.8.ebuild
@@ -5,15 +5,21 @@ EAPI=8
 
 inherit linux-info optfeature
 
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/dell/dkms"
+else
+	SRC_URI="https://github.com/dell/dkms/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
 DESCRIPTION="Dynamic Kernel Module Support"
 HOMEPAGE="https://github.com/dell/dkms"
-SRC_URI="https://github.com/dell/dkms/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-
 IUSE="systemd"
+RESTRICT="test" # Should be run in a container
 
 RDEPEND="
 	sys-apps/kmod
@@ -21,18 +27,14 @@ RDEPEND="
 	systemd? ( sys-apps/systemd )
 "
 
-# Cannot work in the emerge sandbox
-RESTRICT="test"
-
 CONFIG_CHECK="~MODULES"
 
 src_compile() {
-	# Nothing to do here
-	return
+	emake KCONF="/usr/lib/kernel"
 }
 
 src_test() {
-	chmod +x dkms || die
+	chmod +x dkms run_test.sh || die
 	PATH="${PATH}:$(pwd)" ./run_test.sh || die "Tests failed"
 }
 
@@ -40,7 +42,7 @@ src_install() {
 	if use systemd; then
 		emake install-redhat DESTDIR="${ED}" KCONF="/usr/lib/kernel"
 	else
-		emake install DESTDIR="${ED}" KCONF="/usr/lib/kernel"
+		emake install-debian DESTDIR="${ED}" KCONF="/usr/lib/kernel"
 	fi
 
 	einstalldocs