gentoo auto-resync : 07:08:2024 - 12:37:20

5 files changed, 6 insertions, 82 deletions

diff --git a/sys-kernel/dkms/Manifest b/sys-kernel/dkms/Manifest
index 696e96d39788..32474463c265 100644
--- a/sys-kernel/dkms/Manifest
+++ b/sys-kernel/dkms/Manifest
@@ -1,6 +1,3 @@
-AUX dkms-3.0.12-add-gentoo-os-id.patch 345 BLAKE2B 70642f624869ea17c96bc4c9a51e91fefb01b15827abe2ebdb2ed7d4eb7f4b2a2b2cfa9263834489738d3c91dccd1d557f794453ae515dbd2f287eeaeeff9a79 SHA512 abd6d1cb9ce7b6718599e4c372b1d6c97db5cfb56d23da7ae7847d77941cac23f1ed64b094070c4f73781c965d1bb2b1dc52af654194af8b46c11bdb8b3d34fb
-DIST dkms-3.0.12.tar.gz 88241 BLAKE2B 672105074b7899080a2468d347e1fdd60bb6be92852746bccff69565b4f49631568764d265495610d3aebf8df1e0c717daa123d6c3be8752d417ed1c633942e0 SHA512 81646f39c458039958159f519d4dcdfb5dcaa303f7c9898310d13e36c38f30ce57efcc2f2fc98a18ec3d232fd3c50e7a2d859ee42a023e62475e7dad070029d7
 DIST dkms-3.0.13.tar.gz 92840 BLAKE2B ccd677b6e8074fd0ced23f0735817fc36364f4476f7d552af2417b33a4845652a0b0331d3a7642fb5149178674448b479f094fdf27babd64efbfea1491daf671 SHA512 6cf3866730ea92715092b50a1174026dda9a7fb1321796e7c887032ffefb5609c0f6cf59a60ff4d47b7ffee2dac331584073393e9e4e906eaa5a425fc8d22c02
-EBUILD dkms-3.0.12-r1.ebuild 1302 BLAKE2B 9ab35328daa6f3e5edf4e35dad4095cb8d8cd0daf0d46fc8a8cb836db9aac31537011ff7415a583bbacc2edbd432d5d960d995385c6b9c920796e12b9fb5180c SHA512 18528e4d65af809a5f857e00b8070e2bee6441f7c9baa3b68657e98d7c06f54d5a8748f878937a6404031cfba2ee95c79bd145a6d749727b8c6ce92111000bbd
-EBUILD dkms-3.0.13.ebuild 1246 BLAKE2B a7721adc111e4a1f98e99d521a811174dc7ed0dcd3299c2a27aa90a47624e9c2e227541c7a1201c4015d67a00ec4c17853c6abebacfabb236d0e58d3d4733ca2 SHA512 7aeedd6e275849c99a8f475dd377b6b9f614420854fb50232453ad9a6dbe4d978f5700d6198694cded84088032a8238c7d6859b8503febf9aa9f49bd02cec84a
-MISC metadata.xml 1423 BLAKE2B ba5005482cd295624b271e93ccc588a8ded7993c703b81e820150dbc6a8283ae19e8e4fc64327cbb3498292de34740ec15d8561498a8127a588fec01e20eee95 SHA512 15d88c65b0e65e1252ea0fa71fba548aa6bc4e44d727f9933ab0926a7eae9a3a07729a45100213754dac2518ed58b3e13286526b4ebcfed76f8468ae0d7e093d
+EBUILD dkms-3.0.13-r1.ebuild 1022 BLAKE2B 3f0cb2e7746809cf98447f093b6280ac62824a3f2091ed7851cc7e14299a71f073b2208d4ac09395b86bfd6c8ed7ddddd89e1a93ba8f90bef81b26b0aef11b31 SHA512 339c3fde05a0d0b8b7738d8ebf65c4619f4fe7d22ed179c2285da9d9bed0f0271a49917cbee8a8fe7063b11c78fc9eb3d8c55d5a6955ee93740b80da409161cd
+MISC metadata.xml 1447 BLAKE2B eca1543c0cb28d4502f82cc727c929cbe57a35e9fe5cf4475a1367bd89ccb781185917c54492749f3413e60c275248f745da4722324d99f2f5167bc4a7674089 SHA512 bc810e9460ca296b7e1e9405d1716c43139969b06549839fb0bc65c9c242050054b83898b5c60a2a247295fcc472595d0686ea654961e86db25865840e57cd1a
diff --git a/sys-kernel/dkms/dkms-3.0.12-r1.ebuild b/sys-kernel/dkms/dkms-3.0.12-r1.ebuild
deleted file mode 100644
index 7cfc1c96a1f1..000000000000
--- a/sys-kernel/dkms/dkms-3.0.12-r1.ebuild
+++ /dev/null
@@ -1,59 +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"
-KEYWORDS="~amd64 ~arm64 ~x86"
-SLOT="0"
-
-IUSE="systemd"
-
-CONFIG_CHECK="~MODULES"
-
-RDEPEND="
-	sys-apps/kmod
-	virtual/linux-sources
-	systemd? ( sys-apps/systemd )
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-add-gentoo-os-id.patch"
-)
-
-# Can not work in the emerge sandbox
-RESTRICT="test"
-
-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
-	# Backwards compatibility with sys-kernel/installkernel[-systemd]
-	dosym ../../../usr/lib/kernel/postinst.d/dkms /etc/kernel/postinst.d/dkms
-	dosym ../../../usr/lib/kernel/prerm.d/dkms /etc/kernel/prerm.d/dkms
-	einstalldocs
-	keepdir /var/lib/dkms
-}
-
-pkg_postinst() {
-	optfeature "automatically running \"dkms autoinstall\" on each kernel installation" \
-		"sys-kernel/installkernel[systemd]"
-}
diff --git a/sys-kernel/dkms/dkms-3.0.13.ebuild b/sys-kernel/dkms/dkms-3.0.13-r1.ebuild
index 81617cdde7c6..34a2dd47ced9 100644
--- a/sys-kernel/dkms/dkms-3.0.13.ebuild
+++ b/sys-kernel/dkms/dkms-3.0.13-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/dell/dkms/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 
 IUSE="systemd"
 
@@ -42,14 +42,12 @@ src_install() {
 	else
 		emake install DESTDIR="${ED}" KCONF="/usr/lib/kernel"
 	fi
-	# Backwards compatibility with sys-kernel/installkernel[-systemd]
-	dosym ../../../usr/lib/kernel/postinst.d/dkms /etc/kernel/postinst.d/dkms
-	dosym ../../../usr/lib/kernel/prerm.d/dkms /etc/kernel/prerm.d/dkms
+
 	einstalldocs
 	keepdir /var/lib/dkms
 }
 
 pkg_postinst() {
 	optfeature "automatically running \"dkms autoinstall\" on each kernel installation" \
-		"sys-kernel/installkernel[systemd]"
+		sys-kernel/installkernel
 }
diff --git a/sys-kernel/dkms/files/dkms-3.0.12-add-gentoo-os-id.patch b/sys-kernel/dkms/files/dkms-3.0.12-add-gentoo-os-id.patch
deleted file mode 100644
index 10bbacd4fdae..000000000000
--- a/sys-kernel/dkms/files/dkms-3.0.12-add-gentoo-os-id.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/run_test.sh b/run_test.sh
-index 4cda255..af089cb 100755
---- a/run_test.sh
-+++ b/run_test.sh
-@@ -245,7 +245,7 @@ case "${os_id}" in
-     arch | debian | ubuntu)
-         expected_dest_loc=updates/dkms
-         ;;
--    alpine)
-+    alpine | gentoo)
-         expected_dest_loc=kernel/extra
-         mod_compression_ext=.gz
-         ;;
diff --git a/sys-kernel/dkms/metadata.xml b/sys-kernel/dkms/metadata.xml
index bfebb6f1a8ba..29a745a382f7 100644
--- a/sys-kernel/dkms/metadata.xml
+++ b/sys-kernel/dkms/metadata.xml
@@ -15,4 +15,5 @@
 	<upstream>
 		<remote-id type="github">dell/dkms</remote-id>
 	</upstream>
+	<stabilize-allarches/>
 </pkgmetadata>