[gentoo-commits] repo/gentoo:master commit in: dev-debug/strace/

["Sam James" <sam@gentoo.org>]

commit:     f0f84d4b38eebb2dfc7f3206cf2aadbad5de70ef
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 19 01:17:04 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Mar 19 01:17:04 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0f84d4b

dev-debug/strace: use bundled linux-headers

We don't want to pin to linux-headers, that would be far too much
hassle and mean we have to keep many strace versions in-tree.

Closes: https://bugs.gentoo.org/950309
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-debug/strace/strace-6.12.ebuild | 7 +++++--
 dev-debug/strace/strace-6.13.ebuild | 5 ++++-
 dev-debug/strace/strace-6.9.ebuild  | 5 ++++-
 dev-debug/strace/strace-9999.ebuild | 7 +++++--
 4 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/dev-debug/strace/strace-6.12.ebuild b/dev-debug/strace/strace-6.12.ebuild
index b1c0ddf9a697..c96750b5e48e 100644
--- a/dev-debug/strace/strace-6.12.ebuild
+++ b/dev-debug/strace/strace-6.12.ebuild
@@ -40,7 +40,6 @@ LIB_DEPEND="
 DEPEND="
 	static? ( ${LIB_DEPEND} )
 	aio? ( >=dev-libs/libaio-0.3.106 )
-	sys-kernel/linux-headers
 "
 RDEPEND="
 	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
@@ -84,14 +83,18 @@ src_configure() {
 	local myeconfargs=(
 		--disable-gcc-Werror
 
-		# Don't require mpers support on non-multilib systems. #649560
+		# Don't require mpers support on non-multilib systems (bug #649560)
 		--enable-mpers=check
 
+		# We don't want to pin to exact linux-headers versions (bug #950309)
+		--enable-bundled=yes
+
 		$(use_enable static)
 		$(use_with unwind libunwind)
 		$(use_with elfutils libdw)
 		$(use_with selinux libselinux)
 	)
+
 	econf "${myeconfargs[@]}"
 }
 

diff --git a/dev-debug/strace/strace-6.13.ebuild b/dev-debug/strace/strace-6.13.ebuild
index d5b1de3c19a2..196f558d280a 100644
--- a/dev-debug/strace/strace-6.13.ebuild
+++ b/dev-debug/strace/strace-6.13.ebuild
@@ -40,7 +40,6 @@ LIB_DEPEND="
 DEPEND="
 	static? ( ${LIB_DEPEND} )
 	aio? ( >=dev-libs/libaio-0.3.106 )
-	sys-kernel/linux-headers
 "
 RDEPEND="
 	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
@@ -87,11 +86,15 @@ src_configure() {
 		# Don't require mpers support on non-multilib systems. #649560
 		--enable-mpers=check
 
+		# We don't want to pin to exact linux-headers versions (bug #950309)
+		--enable-bundled=yes
+
 		$(use_enable static)
 		$(use_with unwind libunwind)
 		$(use_with elfutils libdw)
 		$(use_with selinux libselinux)
 	)
+
 	econf "${myeconfargs[@]}"
 }
 

diff --git a/dev-debug/strace/strace-6.9.ebuild b/dev-debug/strace/strace-6.9.ebuild
index b1c0ddf9a697..571c162459fb 100644
--- a/dev-debug/strace/strace-6.9.ebuild
+++ b/dev-debug/strace/strace-6.9.ebuild
@@ -40,7 +40,6 @@ LIB_DEPEND="
 DEPEND="
 	static? ( ${LIB_DEPEND} )
 	aio? ( >=dev-libs/libaio-0.3.106 )
-	sys-kernel/linux-headers
 "
 RDEPEND="
 	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
@@ -87,11 +86,15 @@ src_configure() {
 		# Don't require mpers support on non-multilib systems. #649560
 		--enable-mpers=check
 
+		# We don't want to pin to exact linux-headers versions (bug #950309)
+		--enable-bundled=yes
+
 		$(use_enable static)
 		$(use_with unwind libunwind)
 		$(use_with elfutils libdw)
 		$(use_with selinux libselinux)
 	)
+
 	econf "${myeconfargs[@]}"
 }
 

diff --git a/dev-debug/strace/strace-9999.ebuild b/dev-debug/strace/strace-9999.ebuild
index 3b7b64121199..196f558d280a 100644
--- a/dev-debug/strace/strace-9999.ebuild
+++ b/dev-debug/strace/strace-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -40,7 +40,6 @@ LIB_DEPEND="
 DEPEND="
 	static? ( ${LIB_DEPEND} )
 	aio? ( >=dev-libs/libaio-0.3.106 )
-	sys-kernel/linux-headers
 "
 RDEPEND="
 	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
@@ -87,11 +86,15 @@ src_configure() {
 		# Don't require mpers support on non-multilib systems. #649560
 		--enable-mpers=check
 
+		# We don't want to pin to exact linux-headers versions (bug #950309)
+		--enable-bundled=yes
+
 		$(use_enable static)
 		$(use_with unwind libunwind)
 		$(use_with elfutils libdw)
 		$(use_with selinux libselinux)
 	)
+
 	econf "${myeconfargs[@]}"
 }