gentoo auto-resync : 27:11:2024 - 02:00:00

4 files changed, 2 insertions, 88 deletions

diff --git a/sys-kernel/dkms/Manifest b/sys-kernel/dkms/Manifest
index 99972aca2a3f..fa854db6b432 100644
--- a/sys-kernel/dkms/Manifest
+++ b/sys-kernel/dkms/Manifest
@@ -1,8 +1,5 @@
-AUX dkms-3.1.0-cleanup-leftover-cmd.patch 1114 BLAKE2B 276cf2b4ee91484a2ee19f8e33cb2394d43fbaf3abefbb43d9389cea932b2551aeac69a7ad8af4f8b3d0fa46354af1943159c46725cd171d644757aa5cca9a1f SHA512 2ad48d773ac1621fc1b14fa86bd3b2db02342bcf313a1e3bf1ef551bcab9f0020d09d36530a0699d13fed31571c0fe13216f3d9b00842728d21a49720bbf9aff
 DIST dkms-3.0.13.tar.gz 92840 BLAKE2B ccd677b6e8074fd0ced23f0735817fc36364f4476f7d552af2417b33a4845652a0b0331d3a7642fb5149178674448b479f094fdf27babd64efbfea1491daf671 SHA512 6cf3866730ea92715092b50a1174026dda9a7fb1321796e7c887032ffefb5609c0f6cf59a60ff4d47b7ffee2dac331584073393e9e4e906eaa5a425fc8d22c02
-DIST dkms-3.1.0.tar.gz 92614 BLAKE2B 555c2e4d340bf99bf035706186c5f68e8476881a102e14f7f5890122b7193fc634052fdfea4f3d3ce3dad7c8185b5643ed87c4e8e27262b90b3bf964f1ba84bd SHA512 57f9716b1a812b4c265617a27bfca6e559aea66ffb4676cb02f39de1c4670f6c2f8e6457725adc5e43b431579117dac3e22496d35ded57647984c9ba5f5e25e4
-DIST dkms-3.1.1.tar.gz 92491 BLAKE2B c0dc97a17661430a301369e284ddfa73c398b53242cabaa3e4421bce78daa6e422fe2209a937a8294ab7f5b455b9acd32d03240efe12bc4cbe29d88f97a8d3ae SHA512 b39a68de9aba5fad9069ec6bb381359a1706850d8a9681d916fd979717f0c0cbb89f78fae107b0374794836697939b33f3bcf9da2e8901dfa72b00b0b85c9ef3
+DIST dkms-3.1.2.tar.gz 97234 BLAKE2B 74ba5cf41d085f080f780e991c6b80d0a4aa09e5603a33aae801a05d12ffdf824ba29856b9411fed2184bba8cebd83fcb020200126d8134af0a871944a16ecca SHA512 762f7b38bf8cb6d1206f5a1ce189a6d728c2a283ee441b00724d2bc72a1d8e2c2351bd0cc57a1fdb6f209f42828789f590adeac1728f21098068866f7909a480
 EBUILD dkms-3.0.13-r1.ebuild 1022 BLAKE2B 3f0cb2e7746809cf98447f093b6280ac62824a3f2091ed7851cc7e14299a71f073b2208d4ac09395b86bfd6c8ed7ddddd89e1a93ba8f90bef81b26b0aef11b31 SHA512 339c3fde05a0d0b8b7738d8ebf65c4619f4fe7d22ed179c2285da9d9bed0f0271a49917cbee8a8fe7063b11c78fc9eb3d8c55d5a6955ee93740b80da409161cd
-EBUILD dkms-3.1.0-r1.ebuild 1084 BLAKE2B 4e1f083f9785b4f29db747d9c01c2d1120138151193d4720c400207ad4e8cd8e815b0496623e9c25cf220ac37fa2c2dc7a9281049b6e190fb41f57c5e43cac3a SHA512 28e3b965e02fc901c0a2bad6c07529fc45fff18c84d2d5efd26a3d7ff4e009f691e4f90fca143da98180e085d42369aa173294e62693e8ee18ccb67fe782bb59
-EBUILD dkms-3.1.1.ebuild 1024 BLAKE2B ced62fb3ae029d71e4389128cd9989f7561680f7cffe67e64b60875b78651a3e3dc58d1bc2a94c67127e327529da70600ece88091d6ad176fcc075d85b8253c7 SHA512 ed8e449cb203abcdbbe19b6e6cdd773d2916fc8fe833dcb0e3b7c087ff8da55db2ce2e33db17f2f93ca0bccefc731dfe36b681404349cf379f4a496a6d0adf40
+EBUILD dkms-3.1.2.ebuild 1024 BLAKE2B ced62fb3ae029d71e4389128cd9989f7561680f7cffe67e64b60875b78651a3e3dc58d1bc2a94c67127e327529da70600ece88091d6ad176fcc075d85b8253c7 SHA512 ed8e449cb203abcdbbe19b6e6cdd773d2916fc8fe833dcb0e3b7c087ff8da55db2ce2e33db17f2f93ca0bccefc731dfe36b681404349cf379f4a496a6d0adf40
 MISC metadata.xml 1434 BLAKE2B cb34aa7e05b52bd63f860ab0de7adf4e430d8fe7fcb466cefef4a718625a6432e310d65554250cfb9c3914dc102612d2ec4e9cb5c7e8ce5408b50566e475897b SHA512 7132d501fdcb3e2f768032cef040bcf291f0fdc7fb8b448d765dee97b213c2303f2cc741cc648ac2786386e6c3cf2591083b971fd78d9293889dc62a9b0b11e0
diff --git a/sys-kernel/dkms/dkms-3.1.0-r1.ebuild b/sys-kernel/dkms/dkms-3.1.0-r1.ebuild
deleted file mode 100644
index bf3caa23c5cb..000000000000
--- a/sys-kernel/dkms/dkms-3.1.0-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2024 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"
-
-PATCHES=(
-	"${FILESDIR}/${P}-cleanup-leftover-cmd.patch"
-)
-
-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.1.ebuild b/sys-kernel/dkms/dkms-3.1.2.ebuild
index 235f0a1eb372..235f0a1eb372 100644
--- a/sys-kernel/dkms/dkms-3.1.1.ebuild
+++ b/sys-kernel/dkms/dkms-3.1.2.ebuild
diff --git a/sys-kernel/dkms/files/dkms-3.1.0-cleanup-leftover-cmd.patch b/sys-kernel/dkms/files/dkms-3.1.0-cleanup-leftover-cmd.patch
deleted file mode 100644
index cec0cba6161a..000000000000
--- a/sys-kernel/dkms/files/dkms-3.1.0-cleanup-leftover-cmd.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From c0af71e5454214fc9d2b995b9aa45937fe1f3eb2 Mon Sep 17 00:00:00 2001
-From: Simone Caronni <negativo17@gmail.com>
-Date: Sat, 5 Oct 2024 17:06:59 +0200
-Subject: [PATCH] Remove last remnants of log_action_msg from
- dkms_autoinstaller.in
-
----
- dkms_autoinstaller.in | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/dkms_autoinstaller.in b/dkms_autoinstaller.in
-index 31c382e..358e3d1 100755
---- a/dkms_autoinstaller.in
-+++ b/dkms_autoinstaller.in
-@@ -59,9 +59,9 @@ case "$1" in
- 			kernel=$(uname -r)
- 		fi
- 		if [ -f /etc/dkms/no-autoinstall ]; then
--			log_action_msg "Automatic installation of modules has been disabled."
-+			echo "Automatic installation of modules has been disabled."
- 		elif ! _check_kernel_dir $kernel; then
--			log_action_msg "Automatic installation of modules for kernel $kernel was skipped since the kernel headers for this kernel do not seem to be installed."
-+			echo "Automatic installation of modules for kernel $kernel was skipped since the kernel headers for this kernel do not seem to be installed."
- 		else
- 			dkms autoinstall --kernelver $kernel
- 			res=$?