gentoo auto-resync : 20:09:2023 - 05:11:16

4 files changed, 16 insertions, 62 deletions

diff --git a/app-antivirus/Manifest.gz b/app-antivirus/Manifest.gz
index e25a56c3bd1e..3db334b57e7e 100644
--- a/app-antivirus/Manifest.gz
+++ b/app-antivirus/Manifest.gz
diff --git a/app-antivirus/lkrg/Manifest b/app-antivirus/lkrg/Manifest
index b21d6da0f387..3ebe0d0a1987 100644
--- a/app-antivirus/lkrg/Manifest
+++ b/app-antivirus/lkrg/Manifest
@@ -1,9 +1,8 @@
 AUX lkrg-0.9.4-gentoo-paths.patch 717 BLAKE2B cd30d1390ee9df058b93b8c7cfb4f5620084ddcbd7d3bb7c0f8db4b66e16e476314f55dd80ebe1084ea408d516e4857fb1ba5c9767b47255a3b76c756bc35bfa SHA512 5b510e93c676d9ff5c8b0176856dc319302e58e8a45729af0767faffd0189e6fccddbecb656d08926281b35da810e10d8f2c4434b1032e99a31375041374acaa
-DIST lkrg-0.9.5.tar.gz 128061 BLAKE2B 2b8a462033123e310761f84e1ab9e6c914c34a437957566f9a054a625aca2e90aea8c00673b67e178b98b27078f71870f16a7308b38a8e5506cc421af3065648 SHA512 ae735f14bcb92e964a2a1d4cf11f44d8589ebf7b09634799ce38f2b27e9df9eb53e6dc00818df743a20de947ea402dcdcd8bee274b0954addf742547333d939a
-DIST lkrg-0.9.5.tar.gz.sign 801 BLAKE2B 126796abbfe30914910634a31699bc1a2f3889c3569e79610a802a6a6312fda0e388552932bcdc58f9366f790a14c139bafe4443de4ad3dfd66003c3d75f4c71 SHA512 b1ef470962ce45f01d8f26d057ba8fff794c72cbf93cd1559af138a4fa82ebd80c127536c1d50a96365c433246c832f18f2924584bf533f8dcd247d1d38090a8
 DIST lkrg-0.9.6.tar.gz 129563 BLAKE2B d4a39a080312d8cb04152e613b96e0ce882ea9ba50b2ffaef2468a1133ebc5d39c991f4b91ca6c51f26612a89dc23a76887beb1336d9a480d8639089f693eff1 SHA512 08c109ffbe7f15ff60ed1958640f43194b96b16c75bd91c1e209e2f93a2b97f60f0b9ed00ccc13effbbf06092fc3c432dfb55f94b9e181a6cd2b30a1ea8ee653
 DIST lkrg-0.9.6.tar.gz.sign 801 BLAKE2B 2ed63da40ff75c7faee198e5de73ee7be5903c00a3b1cc2f6acda53274bcf8665183cefbf36749a30b0fd78c38ac8dc1fceeb5f37772e3d335ab22c133fdfa91 SHA512 3e9c3df84991a3f4bd2e71069c1fe76021cd9289b82a1dfaaf9a26fdd9ff94840a728b90235db3f185dc143402a3770a247bf8c70d098f170921ec811d9e5299
-EBUILD lkrg-0.9.5.ebuild 1218 BLAKE2B fdc9cbf5e95107d38e57c2d3a917d169fadbfcea44740edbeb6ecce4b0b019de09e22089e53cf0688db550b543d7bd4e3c4df3144acbdc9459c9f5a2b8961270 SHA512 23ec8ab8647ef61cb635b21c9b32f1b167e999a28b7fc8b33a494e102017989bd59c9742b3aa98428670a2f8633730c82263fd245a169b54989bc3ea42f23385
+DIST lkrg-0.9.7.tar.gz 130913 BLAKE2B b6cda651e3c098f17148457be4e056315bfe8d5bb52a8051e9eff422f8deadb7d1e72420d99fa29704fc0216eafe0153b8a6f0c945e55ac5ee71a17043303f2f SHA512 bf1af6d1a4d6811a6e7a17473260c93632e2c0a0b92a2a2ea4a8c2a75a1aaa0811b5bcdb399d9bff8444d5af3b8f4d8394b9b862cd9607fa57a614472553e99c
+DIST lkrg-0.9.7.tar.gz.sign 801 BLAKE2B ecb6f4521d0badd6b289bee0e68f6cff5d1dad3be74a8f7b32c828322fa12550d93291eeedff6e848e6db8805be7717cecc6d75cf4404481067f57200123f34e SHA512 66859311a9320b150e4783e389d2e0df32e04fc35ce3a2a4ac6a488215300677fdd63928e9a877a5fdaf44800cb403cc3ce6de8423adaa15fa3b9fc92b7537a5
 EBUILD lkrg-0.9.6-r1.ebuild 1239 BLAKE2B 1a474a9a0037fb7a518f2d407e09b290622ce9226017054a39cb762b8ee94c6f94faed5737751b2950f00425506c86f0bfe4eeec8fc2f974a41a75a8725c1948 SHA512 027f78998960f1275b646d6df137d2ae9e0c7182cc8a0b37f41793f46fddf829ae13cd5f6a7cc53336f3234889676f884e1e688b02746fea86f466bf269357fc
-EBUILD lkrg-0.9.6.ebuild 1218 BLAKE2B fdc9cbf5e95107d38e57c2d3a917d169fadbfcea44740edbeb6ecce4b0b019de09e22089e53cf0688db550b543d7bd4e3c4df3144acbdc9459c9f5a2b8961270 SHA512 23ec8ab8647ef61cb635b21c9b32f1b167e999a28b7fc8b33a494e102017989bd59c9742b3aa98428670a2f8633730c82263fd245a169b54989bc3ea42f23385
+EBUILD lkrg-0.9.7.ebuild 1239 BLAKE2B 1a474a9a0037fb7a518f2d407e09b290622ce9226017054a39cb762b8ee94c6f94faed5737751b2950f00425506c86f0bfe4eeec8fc2f974a41a75a8725c1948 SHA512 027f78998960f1275b646d6df137d2ae9e0c7182cc8a0b37f41793f46fddf829ae13cd5f6a7cc53336f3234889676f884e1e688b02746fea86f466bf269357fc
 MISC metadata.xml 326 BLAKE2B 01848278e317c44c65d36ffb73d68b87981796f69301447a32ea47f93bc1fda9ca82e7b8036310e733bf1f0ab67a4e31868e48e0c720023a016ae9f743b72f59 SHA512 afa115a36eeb4290c82de2be302f5432294beb26e3d4709de0c67df693694bcdd73573ca24b404493af492e958698c257f4b48395c29d4ab46a9796e871bcc3a
diff --git a/app-antivirus/lkrg/lkrg-0.9.6.ebuild b/app-antivirus/lkrg/lkrg-0.9.6.ebuild
deleted file mode 100644
index 607f6d6dfea0..000000000000
--- a/app-antivirus/lkrg/lkrg-0.9.6.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit linux-mod systemd verify-sig
-
-DESCRIPTION="Linux Kernel Runtime Guard"
-HOMEPAGE="https://lkrg.org"
-SRC_URI="https://lkrg.org/download/${P}.tar.gz
-	verify-sig? ( https://lkrg.org/download/${P}.tar.gz.sign )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-
-BDEPEND="verify-sig? ( sec-keys/openpgp-keys-openwall )"
-
-MODULE_NAMES="lkrg(misc:${S}:${S})"
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/openwall.asc"
-
-PATCHES=( "${FILESDIR}/${PN}-0.9.4-gentoo-paths.patch" )
-
-pkg_setup() {
-	CONFIG_CHECK="HAVE_KRETPROBES KALLSYMS_ALL KPROBES JUMP_LABEL"
-	CONFIG_CHECK+=" MODULE_UNLOAD !PREEMPT_RT ~STACKTRACE"
-	linux-mod_pkg_setup
-
-	# compile against selected (not running) target
-	BUILD_PARAMS="P_KVER=${KV_FULL} P_KERNEL=${KERNEL_DIR}"
-	BUILD_TARGETS="all"
-}
-
-src_unpack() {
-	if use verify-sig; then
-		verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.sign}
-	fi
-
-	default
-}
-
-src_install() {
-	linux-mod_src_install
-
-	systemd_dounit scripts/bootup/systemd/lkrg.service
-	newinitd scripts/bootup/openrc/lkrg lkrg.initd
-
-	insinto /lib/sysctl.d
-	newins scripts/bootup/lkrg.conf 01-lkrg.conf
-}
diff --git a/app-antivirus/lkrg/lkrg-0.9.5.ebuild b/app-antivirus/lkrg/lkrg-0.9.7.ebuild
index 607f6d6dfea0..aef974c6abdd 100644
--- a/app-antivirus/lkrg/lkrg-0.9.5.ebuild
+++ b/app-antivirus/lkrg/lkrg-0.9.7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit linux-mod systemd verify-sig
+inherit linux-mod-r1 systemd verify-sig
 
 DESCRIPTION="Linux Kernel Runtime Guard"
 HOMEPAGE="https://lkrg.org"
@@ -16,7 +16,7 @@ KEYWORDS="~amd64"
 
 BDEPEND="verify-sig? ( sec-keys/openpgp-keys-openwall )"
 
-MODULE_NAMES="lkrg(misc:${S}:${S})"
+# MODULE_NAMES="lkrg(misc:${S}:${S})"
 VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/openwall.asc"
 
 PATCHES=( "${FILESDIR}/${PN}-0.9.4-gentoo-paths.patch" )
@@ -24,11 +24,7 @@ PATCHES=( "${FILESDIR}/${PN}-0.9.4-gentoo-paths.patch" )
 pkg_setup() {
 	CONFIG_CHECK="HAVE_KRETPROBES KALLSYMS_ALL KPROBES JUMP_LABEL"
 	CONFIG_CHECK+=" MODULE_UNLOAD !PREEMPT_RT ~STACKTRACE"
-	linux-mod_pkg_setup
-
-	# compile against selected (not running) target
-	BUILD_PARAMS="P_KVER=${KV_FULL} P_KERNEL=${KERNEL_DIR}"
-	BUILD_TARGETS="all"
+	linux-mod-r1_pkg_setup
 }
 
 src_unpack() {
@@ -39,8 +35,17 @@ src_unpack() {
 	default
 }
 
+src_compile() {
+	local modlist=( lkrg )
+	local modargs=(
+		P_KVER="${KV_FULL}"
+		P_KERNEL="${KERNEL_DIR}"
+	)
+	linux-mod-r1_src_compile
+}
+
 src_install() {
-	linux-mod_src_install
+	linux-mod-r1_src_install
 
 	systemd_dounit scripts/bootup/systemd/lkrg.service
 	newinitd scripts/bootup/openrc/lkrg lkrg.initd