[gentoo-commits] repo/gentoo:master commit in: dev-util/rr/files/, dev-util/rr/

[gentoo-commits] repo/gentoo:master commit in: dev-util/rr/files/, dev-util/rr/

[Mike Frysinger]

commit:     8a79f2bc55c8ae6ef33542d262430927e9954099
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 13 21:11:47 2017 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Mon Feb 13 21:19:13 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a79f2bc

dev-util/rr: fix build w/newer glibc

 dev-util/rr/files/rr-4.5.0-sysmacros.patch | 28 ++++++++++++++++++++++++++++
 dev-util/rr/rr-4.5.0.ebuild                |  4 ++++
 2 files changed, 32 insertions(+)

diff --git a/dev-util/rr/files/rr-4.5.0-sysmacros.patch b/dev-util/rr/files/rr-4.5.0-sysmacros.patch
new file mode 100644
index 0000000000..573d595659
--- /dev/null
+++ b/dev-util/rr/files/rr-4.5.0-sysmacros.patch
@@ -0,0 +1,28 @@
+https://github.com/mozilla/rr/pull/1981
+
+From fefdb3b89e98192601dfdc98c8927c9a91f07f9f Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Mon, 13 Feb 2017 16:01:52 -0500
+Subject: [PATCH] tests: include sys/sysmacros.h for minor/major funcs
+
+Newer versions of glibc are deprecating the implicit sys/sysmacros.h
+include via sys/types.h, so include it explicitly.
+---
+ src/test/rrutil.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/test/rrutil.h b/src/test/rrutil.h
+index 60de6e47a57b..bb5b527c4c9a 100644
+--- a/src/test/rrutil.h
++++ b/src/test/rrutil.h
+@@ -76,6 +76,7 @@
+ #include <sys/socket.h>
+ #include <sys/stat.h>
+ #include <sys/sysinfo.h>
++#include <sys/sysmacros.h>
+ #include <sys/time.h>
+ #include <sys/timerfd.h>
+ #include <sys/times.h>
+-- 
+2.11.0
+

diff --git a/dev-util/rr/rr-4.5.0.ebuild b/dev-util/rr/rr-4.5.0.ebuild
index b83875db0e..f5fa4762e1 100644
--- a/dev-util/rr/rr-4.5.0.ebuild
+++ b/dev-util/rr/rr-4.5.0.ebuild
@@ -29,6 +29,10 @@ DEPEND+="
 	)
 	${PYTHON_DEPS}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-sysmacros.patch
+)
+
 pkg_setup() {
 	if use kernel_linux; then
 		CONFIG_CHECK="SECCOMP"

[gentoo-commits] repo/gentoo:master commit in: dev-util/rr/files/, dev-util/rr/

[Sergei Trofimovich]

commit:     27bcacb0fe144c2de240365826d65c091c998c2c
Author:     Han Han <hanhanzhiyeqianke <AT> gmail <DOT> com>
AuthorDate: Sun Jan  6 21:20:54 2019 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Jan  6 16:32:24 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27bcacb0

dev-util/rr-5.2.0: Fix error type ::ucontext_t not correctly defined

Introduce rr commit:
https://github.com/mozilla/rr/commit/53c5bd72bae089616a3ca626b8af240481d70e6f

Closes: https://bugs.gentoo.org/669788

Signed-off-by: Han Han <hanhanzhiyeqianke <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/10756
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 dev-util/rr/files/rr-5.2.0-ucontext_t.patch | 65 +++++++++++++++++++++++++++++
 dev-util/rr/rr-5.2.0.ebuild                 |  6 +--
 2 files changed, 68 insertions(+), 3 deletions(-)

diff --git a/dev-util/rr/files/rr-5.2.0-ucontext_t.patch b/dev-util/rr/files/rr-5.2.0-ucontext_t.patch
new file mode 100644
index 00000000000..0015f0b150c
--- /dev/null
+++ b/dev-util/rr/files/rr-5.2.0-ucontext_t.patch
@@ -0,0 +1,65 @@
+From 53c5bd72bae089616a3ca626b8af240481d70e6f Mon Sep 17 00:00:00 2001
+From: Robert O'Callahan <robert@ocallahan.org>
+Date: Fri, 10 Aug 2018 15:17:55 +1200
+Subject: [PATCH] Remove ucontext_t/rt_sigframe from kernel-abi
+
+These were added in 18bb097736a1b728f1e5bfec972ca10f6e763d82 to help us determine
+the sigmask effect of rt_sigreturn syscalls, but they're no longer needed
+because we query the new mask via /proc instead.
+
+Resolves #2237
+---
+ src/kernel_abi.h | 33 ---------------------------------
+ 1 file changed, 33 deletions(-)
+
+diff --git a/src/kernel_abi.h b/src/kernel_abi.h
+index e73e49933..29d3c9242 100644
+--- a/src/kernel_abi.h
++++ b/src/kernel_abi.h
+@@ -1609,23 +1609,6 @@ struct X86Arch : public BaseArch<SupportedArch::x86, WordSize32Defs> {
+   };
+   RR_VERIFY_TYPE_ARCH(SupportedArch::x86, ::sigcontext, sigcontext);
+ 
+-  struct ucontext_t {
+-    uint32_t uc_flags;
+-    uint32_t uc_link;
+-    stack_t uc_stack;
+-    sigcontext uc_mcontext;
+-    kernel_sigset_t uc_sigmask;
+-  };
+-
+-  struct rt_sigframe {
+-    uint32_t pretcode;
+-    int sig;
+-    uint32_t pinfo;
+-    uint32_t puc;
+-    siginfo_t info;
+-    struct ucontext_t uc;
+-  };
+-
+   struct _fpstate_32 {
+     uint32_t cw, sw, tag, ipoff, cssel, dataoff, datasel;
+     uint16_t _st[40];
+@@ -1806,22 +1789,6 @@ struct X64Arch : public BaseArch<SupportedArch::x86_64, WordSize64Defs> {
+   RR_VERIFY_TYPE_ARCH(SupportedArch::x86_64, ::user_fpregs_struct,
+                       user_fpregs_struct);
+ 
+-  struct ucontext_t {
+-    uint64_t ucflags;
+-    ptr<struct ucontext_t> uc_link;
+-    stack_t uc_stack;
+-    struct sigcontext uc_mcontext;
+-    sigset_t uc_sigmask;
+-    user_fpregs_struct uc_fpregs;
+-  };
+-  RR_VERIFY_TYPE_ARCH(SupportedArch::x86_64, ::ucontext_t, ucontext_t);
+-
+-  struct rt_sigframe {
+-    ptr<char> pretcode;
+-    struct ucontext_t uc;
+-    siginfo_t info;
+-  };
+-
+   struct user {
+     struct user_regs_struct regs;
+     int u_fpvalid;

diff --git a/dev-util/rr/rr-5.2.0.ebuild b/dev-util/rr/rr-5.2.0.ebuild
index 330b1821df1..8a48df5899c 100644
--- a/dev-util/rr/rr-5.2.0.ebuild
+++ b/dev-util/rr/rr-5.2.0.ebuild
@@ -31,9 +31,9 @@ DEPEND+="
 		sys-devel/gdb[xml]
 	)"
 
-#PATCHES=(
-#	"${FILESDIR}"/${P}-sysmacros.patch
-#)
+PATCHES=(
+	"${FILESDIR}"/${P}-ucontext_t.patch
+)
 
 pkg_setup() {
 	if use kernel_linux; then

[gentoo-commits] repo/gentoo:master commit in: dev-util/rr/files/, dev-util/rr/

[Sergei Trofimovich]

commit:     f999637bb609dbedac15dfca4a608e7bb199ce59
Author:     Dan Robertson <dan <AT> dlrobertson <DOT> com>
AuthorDate: Thu Feb 14 15:53:18 2019 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Thu Feb 14 22:48:34 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f999637b

dev-util/rr: enable c++14 to fix compilation

dev-util/rr-5.2.0 fails to compile if c++14 is not enabled. Add a patch
that ensures that c++14 is enabled

Signed-off-by: Dan Robertson <dan <AT> dlrobertson.com>
Closes: https://github.com/gentoo/gentoo/pull/11051
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 dev-util/rr/files/rr-5.2.0-c++14.patch | 13 +++++++++++++
 dev-util/rr/rr-5.2.0.ebuild            |  1 +
 2 files changed, 14 insertions(+)

diff --git a/dev-util/rr/files/rr-5.2.0-c++14.patch b/dev-util/rr/files/rr-5.2.0-c++14.patch
new file mode 100644
index 00000000000..8458de5f1e9
--- /dev/null
+++ b/dev-util/rr/files/rr-5.2.0-c++14.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0d711f9..756a62e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -42,7 +42,7 @@ set(FLAGS_COMMON "-msse2 -D__MMX__ -D__SSE__ -D__SSE2__ -D__USE_LARGEFILE64 -pth
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${FLAGS_COMMON} -Wstrict-prototypes -std=gnu11")
+ # Define __STDC_LIMIT_MACROS so |#include <stdint.h>| works as expected.
+ # Define __STDC_FORMAT_MACROS so |#include <inttypes.h>| works as expected.
+-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${FLAGS_COMMON} -D__STDC_LIMIT_MACROS -D__STDC_FORMAT_MACROS -std=c++11")
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${FLAGS_COMMON} -D__STDC_LIMIT_MACROS -D__STDC_FORMAT_MACROS -std=c++14")
+ set(CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} -g3")
+ 
+ set(RR_FLAGS_DEBUG "-Wall -Wextra  -O0 -DDEBUG -UNDEBUG")

diff --git a/dev-util/rr/rr-5.2.0.ebuild b/dev-util/rr/rr-5.2.0.ebuild
index 8a48df5899c..8c74d592943 100644
--- a/dev-util/rr/rr-5.2.0.ebuild
+++ b/dev-util/rr/rr-5.2.0.ebuild
@@ -33,6 +33,7 @@ DEPEND+="
 
 PATCHES=(
 	"${FILESDIR}"/${P}-ucontext_t.patch
+	"${FILESDIR}"/${P}-c++14.patch
 )
 
 pkg_setup() {

[gentoo-commits] repo/gentoo:master commit in: dev-util/rr/files/, dev-util/rr/

[Sergei Trofimovich]

commit:     19ea6e50e8dfbdc76287fae73a75add53c08c391
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 12 07:53:07 2019 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Tue Nov 12 07:53:21 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19ea6e50

dev-util/rr: tweak build for glibc-2.30, bug #699886

The build failed as:
```
tgkill.c:7:12: error: static declaration of ‘tgkill’
  follows non-static declaration
    7 | static int tgkill(int tgid, int tid, int sig) {
      |            ^~~~~~
```

Backport upstream glibc-2.30 fix as-is.

Reported-by: Toralf Förster
Closes: https://bugs.gentoo.org/699886
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 dev-util/rr/files/rr-5.2.0-tgkill-glibc-2.30.patch | 35 ++++++++++++++++++++++
 dev-util/rr/rr-5.2.0-r1.ebuild                     |  1 +
 2 files changed, 36 insertions(+)

diff --git a/dev-util/rr/files/rr-5.2.0-tgkill-glibc-2.30.patch b/dev-util/rr/files/rr-5.2.0-tgkill-glibc-2.30.patch
new file mode 100644
index 00000000000..2a6e9daef2f
--- /dev/null
+++ b/dev-util/rr/files/rr-5.2.0-tgkill-glibc-2.30.patch
@@ -0,0 +1,35 @@
+https://bugs.gentoo.org/699886
+
+From 7044c5c6a8e64c737ba3cdb97187ff5c406e5162 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
+Date: Thu, 23 May 2019 23:18:26 +0200
+Subject: [PATCH] Fix build in newer glibc.
+
+Seems tgkill was added recently to glibc.
+
+build/32/tgkill.c:7:12: error: static declaration of 'tgkill' follows non-static declaration
+static int tgkill(int tgid, int tid, int sig) {
+           ^
+/usr/include/bits/signal_ext.h:29:12: note: previous declaration is here
+extern int tgkill (__pid_t __tgid, __pid_t __tid, int __signal);
+---
+ src/test/tgkill.c | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+--- a/src/test/tgkill.c
++++ b/src/test/tgkill.c
+@@ -4,9 +4,8 @@
+ 
+ static int num_signals_caught;
+ 
+-static int tgkill(int tgid, int tid, int sig) {
+-  return syscall(SYS_tgkill, tgid, tid, sig);
+-}
++#define tgkill(tgid, tid, sig) \
++  syscall(SYS_tgkill, (int)(tgid), (int)(tid), (int)(sig))
+ 
+ static void sighandler(int sig) {
+   atomic_printf("Task %d got signal %d\n", sys_gettid(), sig);
+-- 
+2.24.0
+

diff --git a/dev-util/rr/rr-5.2.0-r1.ebuild b/dev-util/rr/rr-5.2.0-r1.ebuild
index aae1bb6569f..b621d7b2009 100644
--- a/dev-util/rr/rr-5.2.0-r1.ebuild
+++ b/dev-util/rr/rr-5.2.0-r1.ebuild
@@ -36,6 +36,7 @@ RESTRICT="!test? ( test )"
 PATCHES=(
 	"${FILESDIR}"/${P}-ucontext_t.patch
 	"${FILESDIR}"/${P}-c++14.patch
+	"${FILESDIR}"/${P}-tgkill-glibc-2.30.patch
 )
 
 pkg_setup() {

[gentoo-commits] repo/gentoo:master commit in: dev-util/rr/files/, dev-util/rr/

[Sam James]

commit:     42256835f74c6385d941e262dcdbfa816af5f01e
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 12 07:56:26 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Apr 12 07:57:38 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42256835

dev-util/rr: drop epoll_pwait2 backport

I only chucked it in because I (wrongly) thought it was needed for the
GCC 13 workaround to cleanly apply, but it isn't. I was just confused
by the spelling commit thing.

We could keep this but as jubalh points out, there's a bunch of subsequent
commits that fixup and enhance epoll_pwait2 support, so let's just leave
it for now & drop it.

I've also asked upstream if there's a release forthcoming & such, so
let's see what happens with that.

Bug: https://github.com/rr-debugger/rr/issues/3494
Fixes: f5e0ac5711c94279073106adf04977cb07db37c7
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-util/rr/files/rr-5.6.0-epoll_pwait2.patch      | 78 ----------------------
 .../rr/{rr-5.6.0-r3.ebuild => rr-5.6.0-r4.ebuild}  |  1 -
 2 files changed, 79 deletions(-)

diff --git a/dev-util/rr/files/rr-5.6.0-epoll_pwait2.patch b/dev-util/rr/files/rr-5.6.0-epoll_pwait2.patch
deleted file mode 100644
index 02d90d36e7dc..000000000000
--- a/dev-util/rr/files/rr-5.6.0-epoll_pwait2.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-https://github.com/rr-debugger/rr/commit/7d1b31dd76d18e9e810455f4abd804e76b0a6c1f
-
-From 7d1b31dd76d18e9e810455f4abd804e76b0a6c1f Mon Sep 17 00:00:00 2001
-From: Robert O'Callahan <robert@ocallahan.org>
-Date: Sun, 26 Mar 2023 23:52:44 +1300
-Subject: [PATCH] Support epoll_pwait2
-
-Resolves #3462
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -933,6 +933,7 @@ set(BASIC_TESTS
-   epoll_edge
-   epoll_many
-   epoll_pwait_eintr_sigmask
-+  epoll_pwait2
-   eventfd
-   exec_flags
-   exec_no_env
---- a/src/record_syscall.cc
-+++ b/src/record_syscall.cc
-@@ -4841,6 +4841,7 @@ static Switchable rec_prepare_syscall_arch(RecordTask* t,
-               sizeof(typename Arch::epoll_event)));
-       return ALLOW_SWITCH;
- 
-+    case Arch::epoll_pwait2:
-     case Arch::epoll_pwait: {
-       syscall_state.reg_parameter(
-           2, ParamSize::from_syscall_result<int>(sizeof(typename Arch::epoll_event) * regs.arg3_signed(),
---- a/src/syscalls.py
-+++ b/src/syscalls.py
-@@ -1729,7 +1729,7 @@ def __init__(self, **kwargs):
- openat2 = UnsupportedSyscall(x86=437, x64=437, generic=437)
- pidfd_getfd = UnsupportedSyscall(x86=438, x64=438, generic=438)
- process_madvise = UnsupportedSyscall(x86=440, x64=440, generic=440)
--epoll_pwait2 = UnsupportedSyscall(x86=441, x64=441, generic=441)
-+epoll_pwait2 = IrregularEmulatedSyscall(x86=441, x64=441, generic=441)
- mount_setattr = UnsupportedSyscall(x86=442, x64=442, generic=442)
- quotactl_fd = UnsupportedSyscall(x86=443, x64=443, generic=443)
- landlock_create_ruleset = UnsupportedSyscall(x86=444, x64=444, generic=444)
---- /dev/null
-+++ b/src/test/epoll_pwait2.c
-@@ -0,0 +1,35 @@
-+/* -*- Mode: C; tab-width: 8; c-basic-offset: 2; indent-tabs-mode: nil; -*- */
-+
-+#include "util.h"
-+
-+static void handle_sig(__attribute__((unused)) int sig) {
-+  /* Don't do anything, just go through the signal handler motions */
-+}
-+
-+int main(void) {
-+  int pipe_fd[2];
-+  int epfd;
-+  struct timespec ts = { 5, 0 };
-+  struct epoll_event ev;
-+  sigset_t sigmask;
-+  sigemptyset(&sigmask);
-+  sigaddset(&sigmask, SIGCHLD);
-+
-+  signal(SIGALRM, handle_sig);
-+
-+  test_assert(0 == pipe(pipe_fd));
-+  test_assert(0 <= (epfd = epoll_create(1 /*num events*/)));
-+
-+  ev.events = EPOLLIN;
-+  ev.data.fd = pipe_fd[0];
-+  test_assert(0 == epoll_ctl(epfd, EPOLL_CTL_ADD, ev.data.fd, &ev));
-+
-+  // Make sure something will wake us from the epoll_pwait2.
-+  alarm(1);
-+  // But also use the epoll_pwait to modify the signal mask.
-+  epoll_pwait2(epfd, &ev, 1, &ts, &sigmask);
-+  test_assert(errno == EINTR || errno == ENOSYS);
-+
-+  atomic_puts("EXIT-SUCCESS");
-+  return 0;
-+}
-

diff --git a/dev-util/rr/rr-5.6.0-r3.ebuild b/dev-util/rr/rr-5.6.0-r4.ebuild
similarity index 97%
rename from dev-util/rr/rr-5.6.0-r3.ebuild
rename to dev-util/rr/rr-5.6.0-r4.ebuild
index bdd724733aaa..559533e754a6 100644
--- a/dev-util/rr/rr-5.6.0-r3.ebuild
+++ b/dev-util/rr/rr-5.6.0-r4.ebuild
@@ -47,7 +47,6 @@ PATCHES=(
 	"${FILESDIR}"/${P}-linux-headers-6.0.patch
 	"${FILESDIR}"/${P}-tests-clang16.patch
 	"${FILESDIR}"/${P}-gcc13.patch
-	"${FILESDIR}"/${P}-epoll_pwait2.patch
 	"${FILESDIR}"/${P}-gcc13-workaround.patch
 )
 

[gentoo-commits] repo/gentoo:master commit in: dev-util/rr/files/, dev-util/rr/

[Sam James]

commit:     f32be099df1a2bd61efa9334a76e7b1718467324
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 15 02:56:29 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Mar 15 03:18:06 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f32be099

dev-util/rr: drop 5.6.0-r2, 5.6.0-r4

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-util/rr/Manifest                               |   1 -
 dev-util/rr/files/rr-5.6.0-gcc13-workaround.patch  | 222 ---------------------
 dev-util/rr/files/rr-5.6.0-gcc13.patch             |  32 ---
 dev-util/rr/files/rr-5.6.0-linux-headers-6.0.patch |  62 ------
 dev-util/rr/files/rr-5.6.0-tests-clang16.patch     |  19 --
 dev-util/rr/rr-5.6.0-r2.ebuild                     |  87 --------
 dev-util/rr/rr-5.6.0-r4.ebuild                     |  88 --------
 7 files changed, 511 deletions(-)

diff --git a/dev-util/rr/Manifest b/dev-util/rr/Manifest
index 5908e870ed7e..a384f453eda3 100644
--- a/dev-util/rr/Manifest
+++ b/dev-util/rr/Manifest
@@ -1,2 +1 @@
-DIST mozilla-rr-5.6.0.tar.gz 1579320 BLAKE2B 14ea99c4486c72db844b5cad3f0c300d7bf5d49449e7080ed0484f89022be6d9b7f81b3808b65f59028a5256a6b3f6508729d5b7e8f3f45d8353ceb7ae2a577a SHA512 4b5ef65b6c6a4b62fc72949b4541aaf608f6133ea0b6c2e529a8eed725e6a0b5186f20ed60b210821e6929410e1f21723840eacfdc85bf12c87703e7ebf5f9a7
 DIST mozilla-rr-5.7.0.tar.gz 1688069 BLAKE2B 613196a441b8c384765403838d4c89248eeb85af203b596ff01610fe65c62650cbeb7f8bde4c97ac4bb65f2bdcf7caa605ca1b6cb2f8f36b0355d816ed39a4f1 SHA512 e0e45f47a5f1de9e0e3f982e9eb5565699189ed23c52de03bf68b8215e7b8ac267619c04495c19e75a55aa8e0face08b9bb6c7f325650384c10a719c17ecf576

diff --git a/dev-util/rr/files/rr-5.6.0-gcc13-workaround.patch b/dev-util/rr/files/rr-5.6.0-gcc13-workaround.patch
deleted file mode 100644
index 30dad8d9fa20..000000000000
--- a/dev-util/rr/files/rr-5.6.0-gcc13-workaround.patch
+++ /dev/null
@@ -1,222 +0,0 @@
-https://bugs.gentoo.org/897874
-https://gcc.gnu.org/bugzilla/show_bug.cgi?id=109420
-https://github.com/rr-debugger/rr/issues/3485
-https://github.com/rr-debugger/rr/commit/e32502d00b18a5225d3b7fbab75fb1e63cb367d2
-
-From e32502d00b18a5225d3b7fbab75fb1e63cb367d2 Mon Sep 17 00:00:00 2001
-From: Robert O'Callahan <robert@ocallahan.org>
-Date: Wed, 5 Apr 2023 08:15:23 +1200
-Subject: [PATCH] Avoid having type members and enum members of `Arch` with the
- same name
-
-Resolves #3485
---- a/src/kernel_abi.h
-+++ b/src/kernel_abi.h
-@@ -1282,7 +1282,7 @@ struct BaseArch : public wordsize,
-   };
-   RR_VERIFY_TYPE_EXPLICIT(struct ::timezone, timezone);
- 
--  struct statfs {
-+  struct statfs_t {
-     __statfs_word f_type;
-     __statfs_word f_bsize;
-     __statfs_word f_blocks;
-@@ -1298,9 +1298,9 @@ struct BaseArch : public wordsize,
-     __statfs_word f_flags;
-     __statfs_word f_spare[4];
-   };
--  RR_VERIFY_TYPE_EXPLICIT(struct ::statfs, statfs);
-+  RR_VERIFY_TYPE_EXPLICIT(struct ::statfs, statfs_t);
- 
--  struct statfs64 {
-+  struct statfs64_t {
-     __statfs_word f_type;
-     __statfs_word f_bsize;
-     uint64_t f_blocks;
-@@ -1316,7 +1316,7 @@ struct BaseArch : public wordsize,
-     __statfs_word f_flags;
-     __statfs_word f_spare[4];
-   };
--  RR_VERIFY_TYPE_EXPLICIT(struct ::statfs64, statfs64);
-+  RR_VERIFY_TYPE_EXPLICIT(struct ::statfs64, statfs64_t);
- 
-   struct itimerval {
-     timeval it_interval;
-@@ -1338,7 +1338,7 @@ struct BaseArch : public wordsize,
-   } stack_t;
-   RR_VERIFY_TYPE(stack_t);
- 
--  struct sysinfo {
-+  struct sysinfo_t {
-     __kernel_long_t uptime;
-     __kernel_ulong_t loads[3];
-     __kernel_ulong_t totalram;
-@@ -1355,7 +1355,7 @@ struct BaseArch : public wordsize,
-     uint32_t mem_unit;
-     char _f[20 - 2 * sizeof(__kernel_ulong_t) - sizeof(uint32_t)];
-   };
--  RR_VERIFY_TYPE_EXPLICIT(struct ::sysinfo, sysinfo);
-+  RR_VERIFY_TYPE_EXPLICIT(struct ::sysinfo, sysinfo_t);
- 
-   static const ::size_t UTSNAME_LENGTH = 65;
-   struct utsname {
-@@ -2093,7 +2093,7 @@ struct X64Arch : public BaseArch<SupportedArch::x86_64, WordSize64Defs> {
-   // Can't verify this one because glibc leaves out the last two members and the
-   // kernel header isn't available to userspace.
- 
--  struct stat {
-+  struct stat_t {
-     dev_t st_dev;
-     ino_t st_ino;
-     nlink_t st_nlink;
-@@ -2110,10 +2110,10 @@ struct X64Arch : public BaseArch<SupportedArch::x86_64, WordSize64Defs> {
-     struct timespec st_ctim;
-     syscall_slong_t __rr_unused[3];
-   };
--  RR_VERIFY_TYPE_ARCH(SupportedArch::x86_64, struct ::stat, struct stat);
-+  RR_VERIFY_TYPE_ARCH(SupportedArch::x86_64, struct ::stat, struct stat_t);
- 
--  struct stat64 : public stat {};
--  RR_VERIFY_TYPE_ARCH(SupportedArch::x86_64, struct ::stat64, struct stat64);
-+  struct stat64_t : public stat_t {};
-+  RR_VERIFY_TYPE_ARCH(SupportedArch::x86_64, struct ::stat64, struct stat64_t);
- 
-   struct semid64_ds {
-     ipc64_perm sem_perm;
-@@ -2291,7 +2291,7 @@ struct X86Arch : public BaseArch<SupportedArch::x86, WordSize32Defs> {
-   };
-   RR_VERIFY_TYPE_X86_ARCH(SupportedArch::x86, ::user, user);
- 
--  struct stat {
-+  struct stat_t {
-     dev_t st_dev;
-     unsigned_short __pad1;
-     ino_t st_ino;
-@@ -2310,9 +2310,9 @@ struct X86Arch : public BaseArch<SupportedArch::x86, WordSize32Defs> {
-     unsigned_long __unused4;
-     unsigned_long __unused5;
-   };
--  RR_VERIFY_TYPE_ARCH(SupportedArch::x86, struct ::stat, struct stat);
-+  RR_VERIFY_TYPE_ARCH(SupportedArch::x86, struct ::stat, struct stat_t);
- 
--  struct __attribute__((packed)) stat64 {
-+  struct __attribute__((packed)) stat64_t {
-     dev_t st_dev;
-     unsigned_int __pad1;
-     ino_t __st_ino;
-@@ -2330,7 +2330,7 @@ struct X86Arch : public BaseArch<SupportedArch::x86, WordSize32Defs> {
-     timespec st_ctim;
-     ino64_t st_ino;
-   };
--  RR_VERIFY_TYPE_ARCH(SupportedArch::x86, struct ::stat64, struct stat64);
-+  RR_VERIFY_TYPE_ARCH(SupportedArch::x86, struct ::stat64, struct stat64_t);
- 
-   struct semid64_ds {
-     ipc64_perm sem_perm;
-@@ -2377,7 +2377,7 @@ struct GenericArch : public BaseArch<arch_, wordsize> {
-   typedef uint32_t legacy_uid_t;
-   typedef uint32_t legacy_gid_t;
- 
--  struct stat {
-+  struct stat_t {
-     dev_t st_dev;
-     ino_t st_ino;
-     mode_t st_mode;
-@@ -2405,7 +2405,7 @@ struct GenericArch : public BaseArch<arch_, wordsize> {
-     typename BaseArch<arch_, wordsize>::unsigned_long __unused4;
-   };
- 
--  struct stat64 : public stat {};
-+  struct stat64_t : public stat_t {};
- };
- 
- struct ARM64Arch : public GenericArch<SupportedArch::aarch64, WordSize64Defs> {
---- a/src/syscalls.py
-+++ b/src/syscalls.py
-@@ -544,7 +544,7 @@ def __init__(self, **kwargs):
- # system.  path is the pathname of any file within the mounted file
- # system.  buf is a pointer to a statfs structure defined
- # approximately as follows:
--statfs = EmulatedSyscall(x86=99, x64=137, generic=43, arg2="struct Arch::statfs")
-+statfs = EmulatedSyscall(x86=99, x64=137, generic=43, arg2="struct Arch::statfs_t")
- 
- #  int fstatfs(int fd, struct statfs *buf)
- #
-@@ -552,7 +552,7 @@ def __init__(self, **kwargs):
- # system.  path is the pathname of any file within the
- # get_time(GET_TID(thread_id));mounted file system.  buf is a pointer
- # to a statfs structure defined approximately as follows:
--fstatfs = EmulatedSyscall(x86=100, x64=138, generic=44, arg2="struct Arch::statfs")
-+fstatfs = EmulatedSyscall(x86=100, x64=138, generic=44, arg2="struct Arch::statfs_t")
- 
- ioperm = EmulatedSyscall(x86=101, x64=173)
- 
-@@ -574,9 +574,9 @@ def __init__(self, **kwargs):
- # stored there.
- setitimer = EmulatedSyscall(x86=104, x64=38, generic=103, arg3="typename Arch::itimerval")
- getitimer = EmulatedSyscall(x86=105, x64=36, generic=102, arg2="typename Arch::itimerval")
--stat = EmulatedSyscall(x86=106, x64=4, arg2="struct Arch::stat")
--lstat = EmulatedSyscall(x86=107, x64=6, arg2="struct Arch::stat")
--fstat = EmulatedSyscall(x86=108, x64=5, generic=80, arg2="struct Arch::stat")
-+stat = EmulatedSyscall(x86=106, x64=4, arg2="struct Arch::stat_t")
-+lstat = EmulatedSyscall(x86=107, x64=6, arg2="struct Arch::stat_t")
-+fstat = EmulatedSyscall(x86=108, x64=5, generic=80, arg2="struct Arch::stat_t")
- olduname = UnsupportedSyscall(x86=109)
- iopl = EmulatedSyscall(x86=110, x64=172)
- vhangup = UnsupportedSyscall(x86=111, x64=153, generic=58)
-@@ -596,7 +596,7 @@ def __init__(self, **kwargs):
- #
- # sysinfo() provides a simple way of getting overall system
- # statistics.
--sysinfo = EmulatedSyscall(x86=116, x64=99, generic=179, arg1="struct Arch::sysinfo")
-+sysinfo = EmulatedSyscall(x86=116, x64=99, generic=179, arg1="struct Arch::sysinfo_t")
- #  int ipc(unsigned int call, int first, int second, int third, void *ptr, long
- #fifth);
- #
-@@ -992,20 +992,20 @@ def __init__(self, **kwargs):
- # int stat(const char *path, struct stat *buf);
- #
- # stat() stats the file pointed to by path and fills in buf.
--stat64 = EmulatedSyscall(x86=195, arg2="struct Arch::stat64")
-+stat64 = EmulatedSyscall(x86=195, arg2="struct Arch::stat64_t")
- 
- #  int lstat(const char *path, struct stat *buf);
- #
- # lstat() is identical to stat(), except that if path is a symbolic
- # link, then the link itself is stat-ed, not the file that it refers
- # to.
--lstat64 = EmulatedSyscall(x86=196, arg2="struct Arch::stat64")
-+lstat64 = EmulatedSyscall(x86=196, arg2="struct Arch::stat64_t")
- 
- #  int fstat(int fd, struct stat *buf)
- #
- # fstat() is identical to stat(), except that the file to be stat-ed
- # is specified by the file descriptor fd.
--fstat64 = EmulatedSyscall(x86=197, arg2="struct Arch::stat64")
-+fstat64 = EmulatedSyscall(x86=197, arg2="struct Arch::stat64_t")
- 
- lchown32 = EmulatedSyscall(x86=198)
- 
-@@ -1342,8 +1342,8 @@ def __init__(self, **kwargs):
- #
- # FIXME: we use arg3() here, although according to man pages this system
- # call has only 2 paramaters. However, strace tells another story...
--statfs64 = EmulatedSyscall(x86=268, arg3="struct Arch::statfs64")
--fstatfs64 = EmulatedSyscall(x86=269, arg3="struct Arch::statfs64")
-+statfs64 = EmulatedSyscall(x86=268, arg3="struct Arch::statfs64_t")
-+fstatfs64 = EmulatedSyscall(x86=269, arg3="struct Arch::statfs64_t")
- 
- #  int tgkill(int tgid, int tid, int sig)
- #
-@@ -1443,8 +1443,8 @@ def __init__(self, **kwargs):
- # The fstatat() system call operates in exactly the same way as
- # stat(2), except for the differences described in this manual
- # page....
--fstatat = EmulatedSyscall(x64=262, generic=79, arg3="struct Arch::stat")
--fstatat64 = EmulatedSyscall(x86=300, arg3="struct Arch::stat64")
-+fstatat = EmulatedSyscall(x64=262, generic=79, arg3="struct Arch::stat_t")
-+fstatat64 = EmulatedSyscall(x86=300, arg3="struct Arch::stat64_t")
- 
- #  int unlinkat(int dirfd, const char *pathname, int flags)
- #
-

diff --git a/dev-util/rr/files/rr-5.6.0-gcc13.patch b/dev-util/rr/files/rr-5.6.0-gcc13.patch
deleted file mode 100644
index 41092a958dd7..000000000000
--- a/dev-util/rr/files/rr-5.6.0-gcc13.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-https://github.com/rr-debugger/rr/commit/2248c85c424e8c257ca88af2732782574d6a3544
-
-From 2248c85c424e8c257ca88af2732782574d6a3544 Mon Sep 17 00:00:00 2001
-From: William Cohen <wcohen@redhat.com>
-Date: Wed, 18 Jan 2023 12:15:04 -0500
-Subject: [PATCH] Explicitly include <cstdint> where required.
-
-The uint8_t and uintptr_t ptr types are from the header <cstdint>.
-Earlier versions of gcc appear to declare them even if the header
-is not included, but gcc-13 does not.  Explicitly including the
-header to allow compilations with gcc-13.
---- a/src/log.h
-+++ b/src/log.h
-@@ -9,6 +9,7 @@
- #include <iostream>
- #include <type_traits>
- #include <vector>
-+#include <cstdint>
- 
- /**
-  * Print siginfo on ostream.
---- a/src/remote_ptr.h
-+++ b/src/remote_ptr.h
-@@ -5,6 +5,7 @@
- 
- #include <cstddef>
- #include <iostream>
-+#include <cstdint>
- 
- namespace rr {
- 
-

diff --git a/dev-util/rr/files/rr-5.6.0-linux-headers-6.0.patch b/dev-util/rr/files/rr-5.6.0-linux-headers-6.0.patch
deleted file mode 100644
index 36a911bcbece..000000000000
--- a/dev-util/rr/files/rr-5.6.0-linux-headers-6.0.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-https://github.com/rr-debugger/rr/commit/2979c60ef8bbf7c940afd90172ddc5d8863f766e
-https://github.com/rr-debugger/rr/issues/3369
-https://bugs.gentoo.org/877157
-
-From 2979c60ef8bbf7c940afd90172ddc5d8863f766e Mon Sep 17 00:00:00 2001
-From: Robert O'Callahan <robert@ocallahan.org>
-Date: Thu, 25 Aug 2022 20:40:59 +1200
-Subject: [PATCH] Avoid creating a struct with elements after
- ethtool_sset_info's variable-length-array.
-
-Resolves #3369
---- a/src/record_syscall.cc
-+++ b/src/record_syscall.cc
-@@ -1450,17 +1450,17 @@ template <typename Arch> void get_ethtool_gstrings_arch(RecordTask* t) {
-   AutoRemoteSyscalls remote(t);
- 
-   // Do a ETHTOOL_GSSET_INFO to get the number of strings
--  struct SingleStringSet {
--    ethtool_sset_info et;
--    uint32_t data;
--  };
--  SingleStringSet sss;
--  sss.et.cmd = ETHTOOL_GSSET_INFO;
--  sss.et.reserved = 0;
--  sss.et.sset_mask = 1 << et_gstrings.string_set;
--  AutoRestoreMem sss_mem(remote, &sss, sizeof(sss));
--
--  ifreq.ifr_ifru.ifru_data = sss_mem.get();
-+  ethtool_sset_info et;
-+  et.cmd = ETHTOOL_GSSET_INFO;
-+  et.reserved = 0;
-+  et.sset_mask = 1 << et_gstrings.string_set;
-+  std::vector<uint8_t> buffer;
-+  buffer.resize(sizeof(et) + sizeof(uint32_t));
-+  memcpy(buffer.data(), &et, sizeof(et));
-+  memset(buffer.data() + sizeof(et), 0, sizeof(uint32_t));
-+  AutoRestoreMem et_mem(remote, buffer.data(), buffer.size());
-+
-+  ifreq.ifr_ifru.ifru_data = et_mem.get();
-   AutoRestoreMem ifr_mem(remote, &ifreq, sizeof(ifreq));
- 
-   long ret = remote.syscall(regs.original_syscallno(), regs.arg1(),
-@@ -1470,8 +1470,7 @@ template <typename Arch> void get_ethtool_gstrings_arch(RecordTask* t) {
-     return;
-   }
- 
--  sss = t->read_mem(sss_mem.get().cast<SingleStringSet>());
--
-+  uint32_t data = t->read_mem((et_mem.get() + sizeof(et)).cast<uint32_t>());
-   // Now do the ETHTOOL_GSTRINGS call
-   ret = remote.syscall(regs.original_syscallno(), regs.arg1(), SIOCETHTOOL,
-       regs.arg3());
-@@ -1479,7 +1478,7 @@ template <typename Arch> void get_ethtool_gstrings_arch(RecordTask* t) {
-   if (ret < 0) {
-     return;
-   }
--  t->record_remote(orig_gstrings, sizeof(ethtool_gstrings) + ETH_GSTRING_LEN*sss.data);
-+  t->record_remote(orig_gstrings, sizeof(ethtool_gstrings) + ETH_GSTRING_LEN*data);
- }
- 
- static void get_ethtool_gstrings(RecordTask* t) {
-

diff --git a/dev-util/rr/files/rr-5.6.0-tests-clang16.patch b/dev-util/rr/files/rr-5.6.0-tests-clang16.patch
deleted file mode 100644
index 8262b10817d4..000000000000
--- a/dev-util/rr/files/rr-5.6.0-tests-clang16.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-https://github.com/rr-debugger/rr/commit/548fab2071054cb7e906c53930b6fab19316dd61
-
-From 548fab2071054cb7e906c53930b6fab19316dd61 Mon Sep 17 00:00:00 2001
-From: Florian Weimer <fweimer@redhat.com>
-Date: Sat, 3 Dec 2022 12:44:48 +0100
-Subject: [PATCH] test: Include <sys/mount.h> in util.h
-
-The mount_ns_exec test needs it to call the mount function.
---- a/src/test/util.h
-+++ b/src/test/util.h
-@@ -80,6 +80,7 @@
- #include <sys/ioctl.h>
- #include <sys/ipc.h>
- #include <sys/mman.h>
-+#include <sys/mount.h>
- #include <sys/msg.h>
- #include <sys/prctl.h>
- #include <sys/ptrace.h>
-

diff --git a/dev-util/rr/rr-5.6.0-r2.ebuild b/dev-util/rr/rr-5.6.0-r2.ebuild
deleted file mode 100644
index 15dff5293fbd..000000000000
--- a/dev-util/rr/rr-5.6.0-r2.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-CMAKE_BUILD_TYPE=Release
-
-inherit cmake linux-info python-single-r1
-
-DESCRIPTION="Record and Replay Framework"
-HOMEPAGE="https://rr-project.org/"
-SRC_URI="https://github.com/rr-debugger/${PN}/archive/${PV}.tar.gz -> mozilla-${P}.tar.gz"
-
-LICENSE="MIT BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="multilib test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="
-	${PYTHON_DEPS}
-	dev-libs/capnproto:=
-	sys-libs/zlib:=
-"
-RDEPEND="
-	${DEPEND}
-	dev-debug/gdb[xml]
-"
-# Add all the deps needed only at build/test time.
-DEPEND+="
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/pexpect[${PYTHON_USEDEP}]
-		')
-		dev-debug/gdb[xml]
-	)"
-
-QA_FLAGS_IGNORED="
-	usr/lib.*/rr/librrpage.so
-	usr/lib.*/rr/librrpage_32.so
-"
-
-RESTRICT="test" # toolchain and kernel version dependent
-
-PATCHES=(
-	"${FILESDIR}"/${P}-linux-headers-6.0.patch
-	"${FILESDIR}"/${P}-tests-clang16.patch
-	"${FILESDIR}"/${P}-gcc13.patch
-)
-
-pkg_setup() {
-	if use kernel_linux; then
-		CONFIG_CHECK="SECCOMP"
-		linux-info_pkg_setup
-	fi
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	sed -i 's:-Werror::' CMakeLists.txt || die #609192
-}
-
-src_test() {
-	if has usersandbox ${FEATURES} ; then
-		ewarn "Test suite fails under FEATURES=usersandbox (bug #632394). Skipping."
-		return 0
-	fi
-
-	cmake_src_test
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTS=$(usex test)
-		-Ddisable32bit=$(usex !multilib) #636786
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	python_fix_shebang "${ED}"/usr/bin/rr-collect-symbols.py
-}

diff --git a/dev-util/rr/rr-5.6.0-r4.ebuild b/dev-util/rr/rr-5.6.0-r4.ebuild
deleted file mode 100644
index 435e16eb2002..000000000000
--- a/dev-util/rr/rr-5.6.0-r4.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-CMAKE_BUILD_TYPE=Release
-
-inherit cmake linux-info python-single-r1
-
-DESCRIPTION="Record and Replay Framework"
-HOMEPAGE="https://rr-project.org/"
-SRC_URI="https://github.com/rr-debugger/${PN}/archive/${PV}.tar.gz -> mozilla-${P}.tar.gz"
-
-LICENSE="MIT BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="multilib test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="
-	${PYTHON_DEPS}
-	dev-libs/capnproto:=
-	sys-libs/zlib:=
-"
-RDEPEND="
-	${DEPEND}
-	dev-debug/gdb[xml]
-"
-# Add all the deps needed only at build/test time.
-DEPEND+="
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/pexpect[${PYTHON_USEDEP}]
-		')
-		dev-debug/gdb[xml]
-	)"
-
-QA_FLAGS_IGNORED="
-	usr/lib.*/rr/librrpage.so
-	usr/lib.*/rr/librrpage_32.so
-"
-
-RESTRICT="test" # toolchain and kernel version dependent
-
-PATCHES=(
-	"${FILESDIR}"/${P}-linux-headers-6.0.patch
-	"${FILESDIR}"/${P}-tests-clang16.patch
-	"${FILESDIR}"/${P}-gcc13.patch
-	"${FILESDIR}"/${P}-gcc13-workaround.patch
-)
-
-pkg_setup() {
-	if use kernel_linux; then
-		CONFIG_CHECK="SECCOMP"
-		linux-info_pkg_setup
-	fi
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	sed -i 's:-Werror::' CMakeLists.txt || die #609192
-}
-
-src_test() {
-	if has usersandbox ${FEATURES} ; then
-		ewarn "Test suite fails under FEATURES=usersandbox (bug #632394). Skipping."
-		return 0
-	fi
-
-	cmake_src_test
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTS=$(usex test)
-		-Ddisable32bit=$(usex !multilib) #636786
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	python_fix_shebang "${ED}"/usr/bin/rr-collect-symbols.py
-}