From 237f1426f27a4e84fefe66542ae2c0b1d7bd7aae Mon Sep 17 00:00:00 2001
From: Sam James <sam@gentoo.org>
Date: Sun, 14 Jun 2026 21:34:59 +0100
Subject: [PATCH] dev-ruby/maxitest: apply test fixes to other versions too

from afa8323a67b40e004195b780fe16ac9eb68f14cc

Bug: https://bugs.gentoo.org/940741
Closes: https://bugs.gentoo.org/977438
Signed-off-by: Sam James <sam@gentoo.org>
---
 dev-ruby/maxitest/maxitest-5.5.0.ebuild |  4 +++-
 dev-ruby/maxitest/maxitest-6.0.1.ebuild | 13 +++----------
 dev-ruby/maxitest/maxitest-6.1.0.ebuild | 13 +++----------
 dev-ruby/maxitest/maxitest-6.2.0.ebuild | 11 ++---------
 4 files changed, 11 insertions(+), 30 deletions(-)

diff --git a/dev-ruby/maxitest/maxitest-5.5.0.ebuild b/dev-ruby/maxitest/maxitest-5.5.0.ebuild
index 6efbd1d837411..707dd9417664e 100644
--- a/dev-ruby/maxitest/maxitest-5.5.0.ebuild
+++ b/dev-ruby/maxitest/maxitest-5.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -36,6 +36,8 @@ all_ruby_prepare() {
 	sed -e '/shows backtrace for/askip' \
 		-e '/describe.*line/ s/describe/xdescribe/' \
 		-e '/describe.*color/ s/describe/xdescribe/' \
+		-e '/stops on ctrl+c and prints errors/askip' \
+		-e '/shows backtraces when in verbose mode/askip' \
 		-i spec/maxitest_spec.rb || die
 }
 
diff --git a/dev-ruby/maxitest/maxitest-6.0.1.ebuild b/dev-ruby/maxitest/maxitest-6.0.1.ebuild
index 947204efd1c4e..eb505503c0588 100644
--- a/dev-ruby/maxitest/maxitest-6.0.1.ebuild
+++ b/dev-ruby/maxitest/maxitest-6.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2025 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -37,6 +37,8 @@ all_ruby_prepare() {
 	sed -e '/shows backtrace for/askip' \
 		-e '/describe.*line/ s/describe/xdescribe/' \
 		-e '/describe.*color/ s/describe/xdescribe/' \
+		-e '/stops on ctrl+c and prints errors/askip' \
+		-e '/shows backtraces when in verbose mode/askip' \
 		-i spec/maxitest_spec.rb || die
 }
 
@@ -45,15 +47,6 @@ each_ruby_prepare() {
 	sed -e '/\(run_cmd\|sh\)/ s:ruby:'${RUBY}':' \
 		-e '/\(run_cmd\|sh\)/ s:mtest:'${RUBY}' -rmaxitest/version -S bin/mtest:' \
 		-i spec/maxitest_spec.rb || die
-
-	case ${RUBY} in
-		*ruby34)
-			# Avoid test failing due to changed messages in Ruby.
-			sed -e '/stops on ctrl+c and prints errors/ s/it/xit/' \
-				-e '/shows backtraces when in verbose mode/ s/it/xit/' \
-				-i spec/maxitest_spec.rb || die
-			;;
-	esac
 }
 
 each_ruby_test() {
diff --git a/dev-ruby/maxitest/maxitest-6.1.0.ebuild b/dev-ruby/maxitest/maxitest-6.1.0.ebuild
index 1e927a31aa8b2..de1445dee4cd9 100644
--- a/dev-ruby/maxitest/maxitest-6.1.0.ebuild
+++ b/dev-ruby/maxitest/maxitest-6.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2025 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -37,6 +37,8 @@ all_ruby_prepare() {
 	sed -e '/shows backtrace for/askip' \
 		-e '/describe.*line/ s/describe/xdescribe/' \
 		-e '/describe.*color/ s/describe/xdescribe/' \
+		-e '/stops on ctrl+c and prints errors/askip' \
+		-e '/shows backtraces when in verbose mode/askip' \
 		-i spec/maxitest_spec.rb || die
 }
 
@@ -45,15 +47,6 @@ each_ruby_prepare() {
 	sed -e '/\(run_cmd\|sh\)/ s:ruby:'${RUBY}':' \
 		-e '/\(run_cmd\|sh\)/ s:mtest:'${RUBY}' -rmaxitest/version -S bin/mtest:' \
 		-i spec/maxitest_spec.rb || die
-
-	case ${RUBY} in
-		*ruby34)
-			# Avoid test failing due to changed messages in Ruby.
-			sed -e '/stops on ctrl+c and prints errors/ s/it/xit/' \
-				-e '/shows backtraces when in verbose mode/ s/it/xit/' \
-				-i spec/maxitest_spec.rb || die
-			;;
-	esac
 }
 
 each_ruby_test() {
diff --git a/dev-ruby/maxitest/maxitest-6.2.0.ebuild b/dev-ruby/maxitest/maxitest-6.2.0.ebuild
index cb10b208cd346..cbbaa67ed69a5 100644
--- a/dev-ruby/maxitest/maxitest-6.2.0.ebuild
+++ b/dev-ruby/maxitest/maxitest-6.2.0.ebuild
@@ -37,6 +37,8 @@ all_ruby_prepare() {
 	sed -e '/shows backtrace for/askip' \
 		-e '/describe.*line/ s/describe/xdescribe/' \
 		-e '/describe.*color/ s/describe/xdescribe/' \
+		-e '/stops on ctrl+c and prints errors/askip' \
+		-e '/shows backtraces when in verbose mode/askip' \
 		-i spec/maxitest_spec.rb || die
 }
 
@@ -45,15 +47,6 @@ each_ruby_prepare() {
 	sed -e '/\(run_cmd\|sh\)/ s:ruby :'${RUBY}' :' \
 		-e '/\(run_cmd\|sh\)/ s:mtest:'${RUBY}' -rmaxitest/version -S bin/mtest:' \
 		-i spec/maxitest_spec.rb || die
-
-	case ${RUBY} in
-		*ruby34)
-			# Avoid test failing due to changed messages in Ruby.
-			sed -e '/stops on ctrl+c and prints errors/ s/it/xit/' \
-				-e '/shows backtraces when in verbose mode/ s/it/xit/' \
-				-i spec/maxitest_spec.rb || die
-			;;
-	esac
 }
 
 each_ruby_test() {