gentoo auto-resync : 31:05:2023 - 03:22:19

3 files changed, 37 insertions, 50 deletions

diff --git a/dev-util/sysdig-kmod/Manifest b/dev-util/sysdig-kmod/Manifest
index c11664a2c347..4f19df9e28fc 100644
--- a/dev-util/sysdig-kmod/Manifest
+++ b/dev-util/sysdig-kmod/Manifest
@@ -1,4 +1,4 @@
 AUX 0.27.1-fix-kmod-build-on-5.18+.patch 2363 BLAKE2B ecd23377a65d2093c7d97158abe3417da2a45d7e10d692731ec3aa4cd1721e1294c516c61668aa30b6d290963a7126bd0a3f1df3da9e6b54d6ab4978bd14aac8 SHA512 a92592ce54b53be679ce094b578ce7c55366a8e3ef5680b83eb09b86b7fbcd3187f302e98424deb4fdcc37c5898167a8309f98e6ec3dd81b0aa47774409d3121
 DIST sysdig-0.27.1.tar.gz 936415 BLAKE2B f4c15e3a2d4b974c5eafc8374f927dd82f123c05cc1976d04b08e77e1a7c0ff53f37c4e2c0022b7073fcc936310daf76ca3c3611141799ae4f51991bc6f3a0a3 SHA512 690f012c7db0a75ec2eb78fae17aae0f422aa1db0d4c2b15c4a09153fd2f60bd3c00d62238976fdcff2a906d87b2e34b81d02c0c78ad2684a1d6016a9988eb08
-EBUILD sysdig-kmod-0.27.1.ebuild 1008 BLAKE2B 9e9ecf6e83a5de4690f2dc3dee217fcd05ec51f4d42ab7a674bfe428f8690adacb42c6f5de7ce5b7261bd2a8d6f1cc9f4e3852cd2077d60b901d032ff0392327 SHA512 680989517e9f3e409ab6084af0c1559a771b900976c918aeedff71b014f578fe88ad7bed4db1b33c9474baf33ceef392c8706ee73de7799f201ed0ce6c2b1a52
+EBUILD sysdig-kmod-0.27.1-r1.ebuild 819 BLAKE2B 024cf63364ab61a8376a415c4794407fdca0cee8c34b45cb5de318b089ef4e5ba29d2b265e950f830b4adf0e739f839289196783ebecd248a2e8b166da411bf7 SHA512 daa895f04e2644b2a8b138f00fc4e92b95a5b0a8487f07abbf84781a27b262e22ef7891ed74827176d5faaa8980adbf48a4f0cac1f5d2bb3df42fafc478d2f0b
 MISC metadata.xml 246 BLAKE2B 35cfb0369ed2d389a18f9df8c6ffa8d61a2ffd51a358d720686706b6e694696fd1c46eab08be11e3733bf11edccb3734869b12612829858131072cae4fa98095 SHA512 113c52a3246e912aa3d5369eef4952e480d8f5a45b6656676fae8b10d3125d7a55430c87680b9f985f11fa58b3f29c1d13b3fdf94896c2f61c0451d0ca6a44a9
diff --git a/dev-util/sysdig-kmod/sysdig-kmod-0.27.1-r1.ebuild b/dev-util/sysdig-kmod/sysdig-kmod-0.27.1-r1.ebuild
new file mode 100644
index 000000000000..b08faed2f3e3
--- /dev/null
+++ b/dev-util/sysdig-kmod/sysdig-kmod-0.27.1-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake linux-mod-r1
+
+MY_P=${P/-kmod}
+DESCRIPTION="Kernel module for dev-util/sysdig"
+HOMEPAGE="https://sysdig.com/"
+SRC_URI="https://github.com/draios/sysdig/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="|| ( MIT GPL-2 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-fix-kmod-build-on-5.18+.patch
+)
+
+CONFIG_CHECK="HAVE_SYSCALL_TRACEPOINTS ~TRACEPOINTS"
+
+src_prepare() {
+	cmake_src_prepare
+
+	# cmake is only used to generate the Makefile for modules
+	sed -i '/USE_BUNDLED_DEPS/,$d' CMakeLists.txt || die
+}
+
+src_compile() {
+	local modlist=( sysdig-probe=:"${BUILD_DIR}"/driver/src )
+	local modargs=( KERNELDIR="${KV_OUT_DIR}" )
+
+	linux-mod-r1_src_compile
+}
diff --git a/dev-util/sysdig-kmod/sysdig-kmod-0.27.1.ebuild b/dev-util/sysdig-kmod/sysdig-kmod-0.27.1.ebuild
deleted file mode 100644
index b679552f204c..000000000000
--- a/dev-util/sysdig-kmod/sysdig-kmod-0.27.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake linux-mod
-
-MY_P=${P/-kmod}
-DESCRIPTION="Kernel module for dev-util/sysdig"
-HOMEPAGE="https://sysdig.com/"
-SRC_URI="https://github.com/draios/sysdig/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="|| ( MIT GPL-2 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="!<=dev-util/sysdig-0.26.4[modules]"
-
-CONFIG_CHECK="HAVE_SYSCALL_TRACEPOINTS ~TRACEPOINTS"
-
-PATCHES=( "${FILESDIR}"/${PV}-fix-kmod-build-on-5.18+.patch )
-
-pkg_pretend() {
-	linux-mod_pkg_setup
-}
-
-pkg_setup() {
-	linux-mod_pkg_setup
-}
-
-src_prepare() {
-	sed -i -e '/USE_BUNDLED_DEPS/,$d' CMakeLists.txt || die
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		# we will use linux-mod for that
-		-DBUILD_DRIVER=OFF
-	)
-
-	cmake_src_configure
-
-	# setup linux-mod ugliness
-	MODULE_NAMES="sysdig-probe(extra:${BUILD_DIR}/driver/src:)"
-	BUILD_PARAMS='KERNELDIR="${KERNEL_DIR}"'
-	BUILD_TARGETS="all"
-}