From 943a450e07e1a1959b34354faad06541dd515c12 Mon Sep 17 00:00:00 2001 From: Sam James Date: Wed, 11 Sep 2024 01:05:38 +0100 Subject: [PATCH 1/6] app-emulation/qemu: fix systemtap has_version check Bug: https://bugs.gentoo.org/938302 Signed-off-by: Sam James --- app-emulation/qemu/qemu-7.2.11.ebuild | 2 +- app-emulation/qemu/qemu-7.2.12.ebuild | 2 +- app-emulation/qemu/qemu-7.2.13.ebuild | 2 +- app-emulation/qemu/qemu-8.0.5.ebuild | 2 +- app-emulation/qemu/qemu-8.1.5.ebuild | 2 +- app-emulation/qemu/qemu-8.2.3.ebuild | 2 +- app-emulation/qemu/qemu-8.2.5-r1.ebuild | 2 +- app-emulation/qemu/qemu-8.2.6-r1.ebuild | 2 +- app-emulation/qemu/qemu-9.0.1-r1.ebuild | 2 +- app-emulation/qemu/qemu-9.0.2-r1.ebuild | 2 +- app-emulation/qemu/qemu-9999.ebuild | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/app-emulation/qemu/qemu-7.2.11.ebuild b/app-emulation/qemu/qemu-7.2.11.ebuild index 5a9af94263527..e928b05fcd7d8 100644 --- a/app-emulation/qemu/qemu-7.2.11.ebuild +++ b/app-emulation/qemu/qemu-7.2.11.ebuild @@ -452,7 +452,7 @@ src_prepare() { export WINDRES=${CHOST}-windres # Workaround for bug #938302 - if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then + if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then cat >> "${S}"/configs/meson/linux.txt <<-EOF || die [binaries] dtrace='stap-dtrace' diff --git a/app-emulation/qemu/qemu-7.2.12.ebuild b/app-emulation/qemu/qemu-7.2.12.ebuild index d9dab196a8bb6..f36330d37cf1f 100644 --- a/app-emulation/qemu/qemu-7.2.12.ebuild +++ b/app-emulation/qemu/qemu-7.2.12.ebuild @@ -452,7 +452,7 @@ src_prepare() { export WINDRES=${CHOST}-windres # Workaround for bug #938302 - if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then + if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then cat >> "${S}"/configs/meson/linux.txt <<-EOF || die [binaries] dtrace='stap-dtrace' diff --git a/app-emulation/qemu/qemu-7.2.13.ebuild b/app-emulation/qemu/qemu-7.2.13.ebuild index d9dab196a8bb6..f36330d37cf1f 100644 --- a/app-emulation/qemu/qemu-7.2.13.ebuild +++ b/app-emulation/qemu/qemu-7.2.13.ebuild @@ -452,7 +452,7 @@ src_prepare() { export WINDRES=${CHOST}-windres # Workaround for bug #938302 - if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then + if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then cat >> "${S}"/configs/meson/linux.txt <<-EOF || die [binaries] dtrace='stap-dtrace' diff --git a/app-emulation/qemu/qemu-8.0.5.ebuild b/app-emulation/qemu/qemu-8.0.5.ebuild index d1a99943c1f82..9db811fb45c29 100644 --- a/app-emulation/qemu/qemu-8.0.5.ebuild +++ b/app-emulation/qemu/qemu-8.0.5.ebuild @@ -455,7 +455,7 @@ src_prepare() { export WINDRES=${CHOST}-windres # Workaround for bug #938302 - if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then + if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then cat >> "${S}"/configs/meson/linux.txt <<-EOF || die [binaries] dtrace='stap-dtrace' diff --git a/app-emulation/qemu/qemu-8.1.5.ebuild b/app-emulation/qemu/qemu-8.1.5.ebuild index f25b0b58db19c..5aacea78586ac 100644 --- a/app-emulation/qemu/qemu-8.1.5.ebuild +++ b/app-emulation/qemu/qemu-8.1.5.ebuild @@ -456,7 +456,7 @@ src_prepare() { export WINDRES=${CHOST}-windres # Workaround for bug #938302 - if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then + if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then cat >> "${S}"/configs/meson/linux.txt <<-EOF || die [binaries] dtrace='stap-dtrace' diff --git a/app-emulation/qemu/qemu-8.2.3.ebuild b/app-emulation/qemu/qemu-8.2.3.ebuild index cd2bb3a7f5551..570039efaff57 100644 --- a/app-emulation/qemu/qemu-8.2.3.ebuild +++ b/app-emulation/qemu/qemu-8.2.3.ebuild @@ -476,7 +476,7 @@ src_prepare() { export WINDRES=${CHOST}-windres # Workaround for bug #938302 - if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then + if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then cat >> "${S}"/configs/meson/linux.txt <<-EOF || die [binaries] dtrace='stap-dtrace' diff --git a/app-emulation/qemu/qemu-8.2.5-r1.ebuild b/app-emulation/qemu/qemu-8.2.5-r1.ebuild index 0f6b1a184aa7d..97bf795e95b83 100644 --- a/app-emulation/qemu/qemu-8.2.5-r1.ebuild +++ b/app-emulation/qemu/qemu-8.2.5-r1.ebuild @@ -476,7 +476,7 @@ src_prepare() { export WINDRES=${CHOST}-windres # Workaround for bug #938302 - if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then + if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then cat >> "${S}"/configs/meson/linux.txt <<-EOF || die [binaries] dtrace='stap-dtrace' diff --git a/app-emulation/qemu/qemu-8.2.6-r1.ebuild b/app-emulation/qemu/qemu-8.2.6-r1.ebuild index 0f6b1a184aa7d..97bf795e95b83 100644 --- a/app-emulation/qemu/qemu-8.2.6-r1.ebuild +++ b/app-emulation/qemu/qemu-8.2.6-r1.ebuild @@ -476,7 +476,7 @@ src_prepare() { export WINDRES=${CHOST}-windres # Workaround for bug #938302 - if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then + if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then cat >> "${S}"/configs/meson/linux.txt <<-EOF || die [binaries] dtrace='stap-dtrace' diff --git a/app-emulation/qemu/qemu-9.0.1-r1.ebuild b/app-emulation/qemu/qemu-9.0.1-r1.ebuild index 10d7d289766a4..2fe9ba5dd5f1c 100644 --- a/app-emulation/qemu/qemu-9.0.1-r1.ebuild +++ b/app-emulation/qemu/qemu-9.0.1-r1.ebuild @@ -480,7 +480,7 @@ src_prepare() { export WINDRES=${CHOST}-windres # Workaround for bug #938302 - if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then + if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then cat >> "${S}"/configs/meson/linux.txt <<-EOF || die [binaries] dtrace='stap-dtrace' diff --git a/app-emulation/qemu/qemu-9.0.2-r1.ebuild b/app-emulation/qemu/qemu-9.0.2-r1.ebuild index 10d7d289766a4..2fe9ba5dd5f1c 100644 --- a/app-emulation/qemu/qemu-9.0.2-r1.ebuild +++ b/app-emulation/qemu/qemu-9.0.2-r1.ebuild @@ -480,7 +480,7 @@ src_prepare() { export WINDRES=${CHOST}-windres # Workaround for bug #938302 - if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then + if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then cat >> "${S}"/configs/meson/linux.txt <<-EOF || die [binaries] dtrace='stap-dtrace' diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild index b99578e9089ee..9784714035371 100644 --- a/app-emulation/qemu/qemu-9999.ebuild +++ b/app-emulation/qemu/qemu-9999.ebuild @@ -479,7 +479,7 @@ src_prepare() { export WINDRES=${CHOST}-windres # Workaround for bug #938302 - if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then + if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then cat >> "${S}"/configs/meson/linux.txt <<-EOF || die [binaries] dtrace='stap-dtrace' From 8169ebbc4e6894a4f5ca3bf9d666baa04014ce33 Mon Sep 17 00:00:00 2001 From: Sam James Date: Wed, 11 Sep 2024 01:07:23 +0100 Subject: [PATCH 2/6] dev-libs/glib: fix systemtap has_version check Bug: https://bugs.gentoo.org/938302 Signed-off-by: Sam James --- dev-libs/glib/glib-2.76.4.ebuild | 2 +- dev-libs/glib/glib-2.78.3.ebuild | 2 +- dev-libs/glib/glib-2.78.4-r1.ebuild | 2 +- dev-libs/glib/glib-2.78.6.ebuild | 2 +- dev-libs/glib/glib-2.80.4.ebuild | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dev-libs/glib/glib-2.76.4.ebuild b/dev-libs/glib/glib-2.76.4.ebuild index 52b264f3f7017..9f9236bbcf7e5 100644 --- a/dev-libs/glib/glib-2.76.4.ebuild +++ b/dev-libs/glib/glib-2.76.4.ebuild @@ -199,7 +199,7 @@ multilib_src_configure() { ) # Workaround for bug #938302 - if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then + if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then local native_file="${T}"/meson.${CHOST}.ini.local cat >> ${native_file} <<-EOF || die [binaries] diff --git a/dev-libs/glib/glib-2.78.3.ebuild b/dev-libs/glib/glib-2.78.3.ebuild index 52b264f3f7017..9f9236bbcf7e5 100644 --- a/dev-libs/glib/glib-2.78.3.ebuild +++ b/dev-libs/glib/glib-2.78.3.ebuild @@ -199,7 +199,7 @@ multilib_src_configure() { ) # Workaround for bug #938302 - if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then + if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then local native_file="${T}"/meson.${CHOST}.ini.local cat >> ${native_file} <<-EOF || die [binaries] diff --git a/dev-libs/glib/glib-2.78.4-r1.ebuild b/dev-libs/glib/glib-2.78.4-r1.ebuild index 6ae0c3800fd5f..6155dc22b039a 100644 --- a/dev-libs/glib/glib-2.78.4-r1.ebuild +++ b/dev-libs/glib/glib-2.78.4-r1.ebuild @@ -208,7 +208,7 @@ multilib_src_configure() { ) # Workaround for bug #938302 - if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then + if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then local native_file="${T}"/meson.${CHOST}.ini.local cat >> ${native_file} <<-EOF || die [binaries] diff --git a/dev-libs/glib/glib-2.78.6.ebuild b/dev-libs/glib/glib-2.78.6.ebuild index 004b9796f1595..084d5059aa142 100644 --- a/dev-libs/glib/glib-2.78.6.ebuild +++ b/dev-libs/glib/glib-2.78.6.ebuild @@ -207,7 +207,7 @@ multilib_src_configure() { ) # Workaround for bug #938302 - if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then + if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then local native_file="${T}"/meson.${CHOST}.ini.local cat >> ${native_file} <<-EOF || die [binaries] diff --git a/dev-libs/glib/glib-2.80.4.ebuild b/dev-libs/glib/glib-2.80.4.ebuild index 79fbaf94dbc0a..e67299e0d3657 100644 --- a/dev-libs/glib/glib-2.80.4.ebuild +++ b/dev-libs/glib/glib-2.80.4.ebuild @@ -208,7 +208,7 @@ multilib_src_configure() { ) # Workaround for bug #938302 - if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then + if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then local native_file="${T}"/meson.${CHOST}.ini.local cat >> ${native_file} <<-EOF || die [binaries] From 8606d2863b3e21f9edcc130faf04a7a73bdb3d53 Mon Sep 17 00:00:00 2001 From: Sam James Date: Wed, 11 Sep 2024 01:08:24 +0100 Subject: [PATCH 3/6] sys-auth/sssd: fix systemtap has_version check Bug: https://bugs.gentoo.org/938302 Signed-off-by: Sam James --- sys-auth/sssd/sssd-2.9.4.ebuild | 2 +- sys-auth/sssd/sssd-2.9.5.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys-auth/sssd/sssd-2.9.4.ebuild b/sys-auth/sssd/sssd-2.9.4.ebuild index 2ef4f0026a1ca..6592cc6d1e681 100644 --- a/sys-auth/sssd/sssd-2.9.4.ebuild +++ b/sys-auth/sssd/sssd-2.9.4.ebuild @@ -164,7 +164,7 @@ src_configure() { local native_dbus_cflags=$($(tc-getPKG_CONFIG) --cflags dbus-1 || die) # Workaround for bug #938302 - if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then + if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then export DTRACE="${BROOT}"/usr/bin/stap-dtrace fi diff --git a/sys-auth/sssd/sssd-2.9.5.ebuild b/sys-auth/sssd/sssd-2.9.5.ebuild index cb1925720b924..995e823a05e94 100644 --- a/sys-auth/sssd/sssd-2.9.5.ebuild +++ b/sys-auth/sssd/sssd-2.9.5.ebuild @@ -164,7 +164,7 @@ src_configure() { local native_dbus_cflags=$($(tc-getPKG_CONFIG) --cflags dbus-1 || die) # Workaround for bug #938302 - if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then + if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then export DTRACE="${BROOT}"/usr/bin/stap-dtrace fi From a166651466d44511d03fa076be30a1f2e9c41d75 Mon Sep 17 00:00:00 2001 From: Sam James Date: Wed, 11 Sep 2024 01:09:58 +0100 Subject: [PATCH 4/6] app-emulation/libvirt: fix systemtap has_version check Bug: https://bugs.gentoo.org/938302 Signed-off-by: Sam James --- app-emulation/libvirt/libvirt-10.0.0-r4.ebuild | 2 +- app-emulation/libvirt/libvirt-10.1.0-r3.ebuild | 2 +- app-emulation/libvirt/libvirt-10.2.0-r2.ebuild | 2 +- app-emulation/libvirt/libvirt-10.3.0-r3.ebuild | 2 +- app-emulation/libvirt/libvirt-10.5.0-r1.ebuild | 2 +- app-emulation/libvirt/libvirt-10.6.0.ebuild | 2 +- app-emulation/libvirt/libvirt-9.8.0-r4.ebuild | 2 +- app-emulation/libvirt/libvirt-9.9.0-r4.ebuild | 2 +- app-emulation/libvirt/libvirt-9999.ebuild | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app-emulation/libvirt/libvirt-10.0.0-r4.ebuild b/app-emulation/libvirt/libvirt-10.0.0-r4.ebuild index a3f65a6e07254..b7393540d081b 100644 --- a/app-emulation/libvirt/libvirt-10.0.0-r4.ebuild +++ b/app-emulation/libvirt/libvirt-10.0.0-r4.ebuild @@ -328,7 +328,7 @@ src_configure() { ) # Workaround for bug #938302 - if use dtrace && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then + if use dtrace && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then local native_file="${T}"/meson.${CHOST}.ini.local cat >> ${native_file} <<-EOF || die [binaries] diff --git a/app-emulation/libvirt/libvirt-10.1.0-r3.ebuild b/app-emulation/libvirt/libvirt-10.1.0-r3.ebuild index 925e76ae0bc63..01a4a6d58b3a5 100644 --- a/app-emulation/libvirt/libvirt-10.1.0-r3.ebuild +++ b/app-emulation/libvirt/libvirt-10.1.0-r3.ebuild @@ -327,7 +327,7 @@ src_configure() { ) # Workaround for bug #938302 - if use dtrace && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then + if use dtrace && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then local native_file="${T}"/meson.${CHOST}.ini.local cat >> ${native_file} <<-EOF || die [binaries] diff --git a/app-emulation/libvirt/libvirt-10.2.0-r2.ebuild b/app-emulation/libvirt/libvirt-10.2.0-r2.ebuild index 66eef4f76550d..4ae9193487c2e 100644 --- a/app-emulation/libvirt/libvirt-10.2.0-r2.ebuild +++ b/app-emulation/libvirt/libvirt-10.2.0-r2.ebuild @@ -326,7 +326,7 @@ src_configure() { ) # Workaround for bug #938302 - if use dtrace && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then + if use dtrace && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then local native_file="${T}"/meson.${CHOST}.ini.local cat >> ${native_file} <<-EOF || die [binaries] diff --git a/app-emulation/libvirt/libvirt-10.3.0-r3.ebuild b/app-emulation/libvirt/libvirt-10.3.0-r3.ebuild index 4d08d7ffec5b5..daa64a693d6fe 100644 --- a/app-emulation/libvirt/libvirt-10.3.0-r3.ebuild +++ b/app-emulation/libvirt/libvirt-10.3.0-r3.ebuild @@ -327,7 +327,7 @@ src_configure() { ) # Workaround for bug #938302 - if use dtrace && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then + if use dtrace && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then local native_file="${T}"/meson.${CHOST}.ini.local cat >> ${native_file} <<-EOF || die [binaries] diff --git a/app-emulation/libvirt/libvirt-10.5.0-r1.ebuild b/app-emulation/libvirt/libvirt-10.5.0-r1.ebuild index 260b98ee3e168..75e4b00922129 100644 --- a/app-emulation/libvirt/libvirt-10.5.0-r1.ebuild +++ b/app-emulation/libvirt/libvirt-10.5.0-r1.ebuild @@ -328,7 +328,7 @@ src_configure() { ) # Workaround for bug #938302 - if use dtrace && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then + if use dtrace && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then local native_file="${T}"/meson.${CHOST}.ini.local cat >> ${native_file} <<-EOF || die [binaries] diff --git a/app-emulation/libvirt/libvirt-10.6.0.ebuild b/app-emulation/libvirt/libvirt-10.6.0.ebuild index 260b98ee3e168..75e4b00922129 100644 --- a/app-emulation/libvirt/libvirt-10.6.0.ebuild +++ b/app-emulation/libvirt/libvirt-10.6.0.ebuild @@ -328,7 +328,7 @@ src_configure() { ) # Workaround for bug #938302 - if use dtrace && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then + if use dtrace && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then local native_file="${T}"/meson.${CHOST}.ini.local cat >> ${native_file} <<-EOF || die [binaries] diff --git a/app-emulation/libvirt/libvirt-9.8.0-r4.ebuild b/app-emulation/libvirt/libvirt-9.8.0-r4.ebuild index 1898092ec1c8f..c033816d45a2f 100644 --- a/app-emulation/libvirt/libvirt-9.8.0-r4.ebuild +++ b/app-emulation/libvirt/libvirt-9.8.0-r4.ebuild @@ -318,7 +318,7 @@ src_configure() { ) # Workaround for bug #938302 - if use dtrace && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then + if use dtrace && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then local native_file="${T}"/meson.${CHOST}.ini.local cat >> ${native_file} <<-EOF || die [binaries] diff --git a/app-emulation/libvirt/libvirt-9.9.0-r4.ebuild b/app-emulation/libvirt/libvirt-9.9.0-r4.ebuild index e9518a3313a88..6bd3782264631 100644 --- a/app-emulation/libvirt/libvirt-9.9.0-r4.ebuild +++ b/app-emulation/libvirt/libvirt-9.9.0-r4.ebuild @@ -319,7 +319,7 @@ src_configure() { ) # Workaround for bug #938302 - if use dtrace && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then + if use dtrace && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then local native_file="${T}"/meson.${CHOST}.ini.local cat >> ${native_file} <<-EOF || die [binaries] diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild index 260b98ee3e168..75e4b00922129 100644 --- a/app-emulation/libvirt/libvirt-9999.ebuild +++ b/app-emulation/libvirt/libvirt-9999.ebuild @@ -328,7 +328,7 @@ src_configure() { ) # Workaround for bug #938302 - if use dtrace && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then + if use dtrace && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then local native_file="${T}"/meson.${CHOST}.ini.local cat >> ${native_file} <<-EOF || die [binaries] From 476889f92660dcad5f50a8670588cd3d7227a92b Mon Sep 17 00:00:00 2001 From: Sam James Date: Wed, 11 Sep 2024 01:11:43 +0100 Subject: [PATCH 5/6] dev-java/openjdk: fix systemtap has_version check Bug: https://bugs.gentoo.org/938302 Signed-off-by: Sam James --- dev-java/openjdk/openjdk-11.0.24_p8.ebuild | 2 +- dev-java/openjdk/openjdk-17.0.12_p7.ebuild | 2 +- dev-java/openjdk/openjdk-21.0.4_p7.ebuild | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dev-java/openjdk/openjdk-11.0.24_p8.ebuild b/dev-java/openjdk/openjdk-11.0.24_p8.ebuild index 73935ecc1856e..fdf4cbbec3a19 100644 --- a/dev-java/openjdk/openjdk-11.0.24_p8.ebuild +++ b/dev-java/openjdk/openjdk-11.0.24_p8.ebuild @@ -164,7 +164,7 @@ src_configure() { fi # Workaround for bug #938302 - if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then + if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then export DTRACE="${BROOT}"/usr/bin/stap-dtrace fi diff --git a/dev-java/openjdk/openjdk-17.0.12_p7.ebuild b/dev-java/openjdk/openjdk-17.0.12_p7.ebuild index b871b4d9db1a4..46a240264a9ae 100644 --- a/dev-java/openjdk/openjdk-17.0.12_p7.ebuild +++ b/dev-java/openjdk/openjdk-17.0.12_p7.ebuild @@ -178,7 +178,7 @@ src_configure() { fi # Workaround for bug #938302 - if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then + if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then export DTRACE="${BROOT}"/usr/bin/stap-dtrace fi diff --git a/dev-java/openjdk/openjdk-21.0.4_p7.ebuild b/dev-java/openjdk/openjdk-21.0.4_p7.ebuild index 2ab8efa649790..2d2f4a5ddf98c 100644 --- a/dev-java/openjdk/openjdk-21.0.4_p7.ebuild +++ b/dev-java/openjdk/openjdk-21.0.4_p7.ebuild @@ -176,7 +176,7 @@ src_configure() { fi # Workaround for bug #938302 - if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then + if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then export DTRACE="${BROOT}"/usr/bin/stap-dtrace fi From 148f5bc17a32dc8578f126864fcf7794bb04b8c6 Mon Sep 17 00:00:00 2001 From: Sam James Date: Wed, 11 Sep 2024 01:12:41 +0100 Subject: [PATCH 6/6] dev-lang/ruby: fix systemtap has_version check Bug: https://bugs.gentoo.org/938302 Signed-off-by: Sam James --- dev-lang/ruby/ruby-3.1.4-r3.ebuild | 2 +- dev-lang/ruby/ruby-3.1.5.ebuild | 2 +- dev-lang/ruby/ruby-3.1.6-r1.ebuild | 2 +- dev-lang/ruby/ruby-3.2.3.ebuild | 2 +- dev-lang/ruby/ruby-3.2.4-r1.ebuild | 2 +- dev-lang/ruby/ruby-3.2.4.ebuild | 2 +- dev-lang/ruby/ruby-3.2.5.ebuild | 2 +- dev-lang/ruby/ruby-3.3.2.ebuild | 2 +- dev-lang/ruby/ruby-3.3.4-r1.ebuild | 2 +- dev-lang/ruby/ruby-3.3.4.ebuild | 2 +- dev-lang/ruby/ruby-3.3.5.ebuild | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dev-lang/ruby/ruby-3.1.4-r3.ebuild b/dev-lang/ruby/ruby-3.1.4-r3.ebuild index e4a60e643913c..d001f2f4830a1 100644 --- a/dev-lang/ruby/ruby-3.1.4-r3.ebuild +++ b/dev-lang/ruby/ruby-3.1.4-r3.ebuild @@ -141,7 +141,7 @@ src_configure() { append-flags -fno-strict-aliasing # Workaround for bug #938302 - if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then + if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then export DTRACE="${BROOT}"/usr/bin/stap-dtrace fi diff --git a/dev-lang/ruby/ruby-3.1.5.ebuild b/dev-lang/ruby/ruby-3.1.5.ebuild index 09b8eed003fce..e99079d0b503f 100644 --- a/dev-lang/ruby/ruby-3.1.5.ebuild +++ b/dev-lang/ruby/ruby-3.1.5.ebuild @@ -150,7 +150,7 @@ src_configure() { append-flags -fno-strict-aliasing # Workaround for bug #938302 - if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then + if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then export DTRACE="${BROOT}"/usr/bin/stap-dtrace fi diff --git a/dev-lang/ruby/ruby-3.1.6-r1.ebuild b/dev-lang/ruby/ruby-3.1.6-r1.ebuild index 5317d35b0fe19..9d129e2534a84 100644 --- a/dev-lang/ruby/ruby-3.1.6-r1.ebuild +++ b/dev-lang/ruby/ruby-3.1.6-r1.ebuild @@ -160,7 +160,7 @@ src_configure() { append-flags -fno-strict-aliasing # Workaround for bug #938302 - if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then + if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then export DTRACE="${BROOT}"/usr/bin/stap-dtrace fi diff --git a/dev-lang/ruby/ruby-3.2.3.ebuild b/dev-lang/ruby/ruby-3.2.3.ebuild index defcbe17bb805..71fb23fe30c06 100644 --- a/dev-lang/ruby/ruby-3.2.3.ebuild +++ b/dev-lang/ruby/ruby-3.2.3.ebuild @@ -161,7 +161,7 @@ src_configure() { append-flags -fno-strict-aliasing # Workaround for bug #938302 - if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then + if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then export DTRACE="${BROOT}"/usr/bin/stap-dtrace fi diff --git a/dev-lang/ruby/ruby-3.2.4-r1.ebuild b/dev-lang/ruby/ruby-3.2.4-r1.ebuild index e9eeab6720c36..7152cb0f52fc4 100644 --- a/dev-lang/ruby/ruby-3.2.4-r1.ebuild +++ b/dev-lang/ruby/ruby-3.2.4-r1.ebuild @@ -166,7 +166,7 @@ src_configure() { append-flags -fno-strict-aliasing # Workaround for bug #938302 - if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then + if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then export DTRACE="${BROOT}"/usr/bin/stap-dtrace fi diff --git a/dev-lang/ruby/ruby-3.2.4.ebuild b/dev-lang/ruby/ruby-3.2.4.ebuild index 29eafa112bc84..524d5af27834e 100644 --- a/dev-lang/ruby/ruby-3.2.4.ebuild +++ b/dev-lang/ruby/ruby-3.2.4.ebuild @@ -162,7 +162,7 @@ src_configure() { append-flags -fno-strict-aliasing # Workaround for bug #938302 - if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then + if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then export DTRACE="${BROOT}"/usr/bin/stap-dtrace fi diff --git a/dev-lang/ruby/ruby-3.2.5.ebuild b/dev-lang/ruby/ruby-3.2.5.ebuild index d7e52fe863228..213e5f3d18a4a 100644 --- a/dev-lang/ruby/ruby-3.2.5.ebuild +++ b/dev-lang/ruby/ruby-3.2.5.ebuild @@ -166,7 +166,7 @@ src_configure() { append-flags -fno-strict-aliasing # Workaround for bug #938302 - if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then + if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then export DTRACE="${BROOT}"/usr/bin/stap-dtrace fi diff --git a/dev-lang/ruby/ruby-3.3.2.ebuild b/dev-lang/ruby/ruby-3.3.2.ebuild index e6bcd9a7151c1..5c94ac824b14f 100644 --- a/dev-lang/ruby/ruby-3.3.2.ebuild +++ b/dev-lang/ruby/ruby-3.3.2.ebuild @@ -163,7 +163,7 @@ src_configure() { append-flags -fno-strict-aliasing # Workaround for bug #938302 - if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then + if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then export DTRACE="${BROOT}"/usr/bin/stap-dtrace fi diff --git a/dev-lang/ruby/ruby-3.3.4-r1.ebuild b/dev-lang/ruby/ruby-3.3.4-r1.ebuild index 0e86f0e2350b3..8cf5cb51be156 100644 --- a/dev-lang/ruby/ruby-3.3.4-r1.ebuild +++ b/dev-lang/ruby/ruby-3.3.4-r1.ebuild @@ -169,7 +169,7 @@ src_configure() { append-flags -fno-strict-aliasing # Workaround for bug #938302 - if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then + if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then export DTRACE="${BROOT}"/usr/bin/stap-dtrace fi diff --git a/dev-lang/ruby/ruby-3.3.4.ebuild b/dev-lang/ruby/ruby-3.3.4.ebuild index a85d9608d0bb4..fac732e48cf15 100644 --- a/dev-lang/ruby/ruby-3.3.4.ebuild +++ b/dev-lang/ruby/ruby-3.3.4.ebuild @@ -168,7 +168,7 @@ src_configure() { append-flags -fno-strict-aliasing # Workaround for bug #938302 - if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then + if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then export DTRACE="${BROOT}"/usr/bin/stap-dtrace fi diff --git a/dev-lang/ruby/ruby-3.3.5.ebuild b/dev-lang/ruby/ruby-3.3.5.ebuild index 0e86f0e2350b3..8cf5cb51be156 100644 --- a/dev-lang/ruby/ruby-3.3.5.ebuild +++ b/dev-lang/ruby/ruby-3.3.5.ebuild @@ -169,7 +169,7 @@ src_configure() { append-flags -fno-strict-aliasing # Workaround for bug #938302 - if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then + if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then export DTRACE="${BROOT}"/usr/bin/stap-dtrace fi