diff --git a/sdk_container/src/third_party/portage-stable/dev-debug/strace/strace-6.12.ebuild b/sdk_container/src/third_party/portage-stable/dev-debug/strace/strace-6.12.ebuild index b1c0ddf9a6..c96750b5e4 100644 --- a/sdk_container/src/third_party/portage-stable/dev-debug/strace/strace-6.12.ebuild +++ b/sdk_container/src/third_party/portage-stable/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/sdk_container/src/third_party/portage-stable/dev-debug/strace/strace-6.13.ebuild b/sdk_container/src/third_party/portage-stable/dev-debug/strace/strace-6.13.ebuild index d5b1de3c19..571c162459 100644 --- a/sdk_container/src/third_party/portage-stable/dev-debug/strace/strace-6.13.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-debug/strace/strace-6.13.ebuild @@ -16,7 +16,7 @@ else https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz verify-sig? ( https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz.asc ) " - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" + KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" fi VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/strace.asc @@ -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/sdk_container/src/third_party/portage-stable/dev-debug/strace/strace-6.9.ebuild b/sdk_container/src/third_party/portage-stable/dev-debug/strace/strace-6.9.ebuild index b1c0ddf9a6..571c162459 100644 --- a/sdk_container/src/third_party/portage-stable/dev-debug/strace/strace-6.9.ebuild +++ b/sdk_container/src/third_party/portage-stable/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/sdk_container/src/third_party/portage-stable/dev-debug/strace/strace-9999.ebuild b/sdk_container/src/third_party/portage-stable/dev-debug/strace/strace-9999.ebuild index 3b7b641211..196f558d28 100644 --- a/sdk_container/src/third_party/portage-stable/dev-debug/strace/strace-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/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[@]}" }