dev-ruby/activesupport: adapt to slotted dev-ruby/minitest

Rails needs <dev-ruby/minitest-5.16. We've slotted minitest because
ruby32 needs >=dev-ruby/minitest-5.16, so adapt the dep accordingly.

Note that activesupport *also* needs minitest at runtime and from
when I tried testing/patching activesupport for minitest-5.16+, it's
broken when others try to use it for testing w/ 5.16, so change RDEPEND too.

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

9 files changed, 31 insertions, 22 deletions

diff --git a/dev-ruby/activesupport/activesupport-6.0.5.1.ebuild b/dev-ruby/activesupport/activesupport-6.0.5.1-r1.ebuild
index 43548b7c90bd..3308b86b956f 100644
--- a/dev-ruby/activesupport/activesupport-6.0.5.1.ebuild
+++ b/dev-ruby/activesupport/activesupport-6.0.5.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -30,7 +30,7 @@ ruby_add_rdepend "
 	>=dev-ruby/concurrent-ruby-1.0.2:1
 	dev-ruby/i18n:1
 	>=dev-ruby/tzinfo-1.1:1
-	>=dev-ruby/minitest-5.1:5
+	<dev-ruby/minitest-5.16:*
 	>=dev-ruby/zeitwerk-2.2:2
 "
 
@@ -43,7 +43,6 @@ ruby_add_bdepend "test? (
 	>=dev-ruby/listen-3.0.5:3
 	dev-ruby/rack
 	dev-ruby/mocha
-	<dev-ruby/minitest-5.16:5
 	)"
 
 all_ruby_prepare() {
@@ -60,6 +59,8 @@ all_ruby_prepare() {
 	rm ../Gemfile.lock || die
 	sed -i -e '1igem "tzinfo", "~> 1.1"; gem "psych", "~> 3.0"' test/abstract_unit.rb || die
 
+	sed -i -e '/minitest.*~> 5.1/s:.*:&, "< 5.16":' ${RUBY_FAKEGEM_GEMSPEC} || die
+
 	# Avoid test that depends on timezone
 	sed -i -e '/test_implicit_coercion/,/^  end/ s:^:#:' test/core_ext/duration_test.rb || die
 
diff --git a/dev-ruby/activesupport/activesupport-6.0.6.1.ebuild b/dev-ruby/activesupport/activesupport-6.0.6.1-r1.ebuild
index 473970606372..472f44c5a7fe 100644
--- a/dev-ruby/activesupport/activesupport-6.0.6.1.ebuild
+++ b/dev-ruby/activesupport/activesupport-6.0.6.1-r1.ebuild
@@ -29,8 +29,8 @@ RUBY_S="rails-${PV}/${PN}"
 ruby_add_rdepend "
 	>=dev-ruby/concurrent-ruby-1.0.2:1
 	dev-ruby/i18n:1
+	<dev-ruby/minitest-5.16:*
 	>=dev-ruby/tzinfo-1.1:1
-	>=dev-ruby/minitest-5.1:5
 	>=dev-ruby/zeitwerk-2.2:2
 "
 
@@ -43,7 +43,6 @@ ruby_add_bdepend "test? (
 	>=dev-ruby/listen-3.0.5:3
 	dev-ruby/rack
 	dev-ruby/mocha
-	<dev-ruby/minitest-5.16:5
 	)"
 
 all_ruby_prepare() {
@@ -60,6 +59,8 @@ all_ruby_prepare() {
 	rm ../Gemfile.lock || die
 	sed -i -e '1igem "tzinfo", "~> 1.1"; gem "psych", "~> 3.0"' test/abstract_unit.rb || die
 
+	sed -i -e '/minitest.*~> 5.1/s:.*:&, "< 5.16":' ${RUBY_FAKEGEM_GEMSPEC} || die
+
 	# Avoid test that depends on timezone
 	sed -i -e '/test_implicit_coercion/,/^  end/ s:^:#:' test/core_ext/duration_test.rb || die
 
diff --git a/dev-ruby/activesupport/activesupport-6.1.6.1.ebuild b/dev-ruby/activesupport/activesupport-6.1.6.1-r1.ebuild
index 613922116101..1842d1c057d8 100644
--- a/dev-ruby/activesupport/activesupport-6.1.6.1.ebuild
+++ b/dev-ruby/activesupport/activesupport-6.1.6.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -28,7 +28,7 @@ ruby_add_rdepend "
 	>=dev-ruby/concurrent-ruby-1.0.2:1
 	>=dev-ruby/i18n-1.6:1
 	dev-ruby/tzinfo:2
-	>=dev-ruby/minitest-5.1:5
+	<dev-ruby/minitest-5.16:*
 	>=dev-ruby/zeitwerk-2.3:2
 "
 
@@ -43,7 +43,6 @@ ruby_add_bdepend "test? (
 	dev-ruby/rack
 	dev-ruby/rexml
 	dev-ruby/mocha
-	<dev-ruby/minitest-5.16:5
 	)"
 
 all_ruby_prepare() {
@@ -59,6 +58,8 @@ all_ruby_prepare() {
 	rm ../Gemfile.lock || die
 #	sed -i -e '1igem "tzinfo", "~> 1.1"' test/abstract_unit.rb || die
 
+	sed -i -e '/minitest.*>= 5.1/s:.*:&, "< 5.16":' ${RUBY_FAKEGEM_GEMSPEC} || die
+
 	# Avoid test that depends on timezone
 	sed -i -e '/test_implicit_coercion/,/^  end/ s:^:#:' test/core_ext/duration_test.rb || die
 
diff --git a/dev-ruby/activesupport/activesupport-6.1.7.3.ebuild b/dev-ruby/activesupport/activesupport-6.1.7-r1.ebuild
index 019a5ee151fb..268c519f718c 100644
--- a/dev-ruby/activesupport/activesupport-6.1.7.3.ebuild
+++ b/dev-ruby/activesupport/activesupport-6.1.7-r1.ebuild
@@ -28,7 +28,7 @@ ruby_add_rdepend "
 	>=dev-ruby/concurrent-ruby-1.0.2:1
 	>=dev-ruby/i18n-1.6:1
 	dev-ruby/tzinfo:2
-	>=dev-ruby/minitest-5.1:5
+	<dev-ruby/minitest-5.16:*
 	>=dev-ruby/zeitwerk-2.3:2
 "
 
@@ -43,7 +43,6 @@ ruby_add_bdepend "test? (
 	dev-ruby/rack
 	dev-ruby/rexml
 	dev-ruby/mocha
-	<dev-ruby/minitest-5.16:5
 	)"
 
 all_ruby_prepare() {
@@ -59,6 +58,8 @@ all_ruby_prepare() {
 	rm ../Gemfile.lock || die
 #	sed -i -e '1igem "tzinfo", "~> 1.1"' test/abstract_unit.rb || die
 
+	sed -i -e '/minitest.*>= 5.1/s:.*:&, "< 5.16":' ${RUBY_FAKEGEM_GEMSPEC} || die
+
 	# Avoid test that depends on timezone
 	sed -i -e '/test_implicit_coercion/,/^  end/ s:^:#:' test/core_ext/duration_test.rb || die
 
diff --git a/dev-ruby/activesupport/activesupport-6.1.7.2.ebuild b/dev-ruby/activesupport/activesupport-6.1.7.2-r1.ebuild
index 99169f856a6d..1611bfb4a059 100644
--- a/dev-ruby/activesupport/activesupport-6.1.7.2.ebuild
+++ b/dev-ruby/activesupport/activesupport-6.1.7.2-r1.ebuild
@@ -28,7 +28,7 @@ ruby_add_rdepend "
 	>=dev-ruby/concurrent-ruby-1.0.2:1
 	>=dev-ruby/i18n-1.6:1
 	dev-ruby/tzinfo:2
-	>=dev-ruby/minitest-5.1:5
+<dev-ruby/minitest-5.16:*
 	>=dev-ruby/zeitwerk-2.3:2
 "
 
@@ -43,7 +43,6 @@ ruby_add_bdepend "test? (
 	dev-ruby/rack
 	dev-ruby/rexml
 	dev-ruby/mocha
-	<dev-ruby/minitest-5.16:5
 	)"
 
 all_ruby_prepare() {
@@ -59,6 +58,8 @@ all_ruby_prepare() {
 	rm ../Gemfile.lock || die
 #	sed -i -e '1igem "tzinfo", "~> 1.1"' test/abstract_unit.rb || die
 
+	sed -i -e '/minitest.*>= 5.1/s:.*:&, "< 5.16":' ${RUBY_FAKEGEM_GEMSPEC} || die
+
 	# Avoid test that depends on timezone
 	sed -i -e '/test_implicit_coercion/,/^  end/ s:^:#:' test/core_ext/duration_test.rb || die
 
diff --git a/dev-ruby/activesupport/activesupport-6.1.7.ebuild b/dev-ruby/activesupport/activesupport-6.1.7.3-r1.ebuild
index 76d366006776..268c519f718c 100644
--- a/dev-ruby/activesupport/activesupport-6.1.7.ebuild
+++ b/dev-ruby/activesupport/activesupport-6.1.7.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -28,7 +28,7 @@ ruby_add_rdepend "
 	>=dev-ruby/concurrent-ruby-1.0.2:1
 	>=dev-ruby/i18n-1.6:1
 	dev-ruby/tzinfo:2
-	>=dev-ruby/minitest-5.1:5
+	<dev-ruby/minitest-5.16:*
 	>=dev-ruby/zeitwerk-2.3:2
 "
 
@@ -43,7 +43,6 @@ ruby_add_bdepend "test? (
 	dev-ruby/rack
 	dev-ruby/rexml
 	dev-ruby/mocha
-	<dev-ruby/minitest-5.16:5
 	)"
 
 all_ruby_prepare() {
@@ -59,6 +58,8 @@ all_ruby_prepare() {
 	rm ../Gemfile.lock || die
 #	sed -i -e '1igem "tzinfo", "~> 1.1"' test/abstract_unit.rb || die
 
+	sed -i -e '/minitest.*>= 5.1/s:.*:&, "< 5.16":' ${RUBY_FAKEGEM_GEMSPEC} || die
+
 	# Avoid test that depends on timezone
 	sed -i -e '/test_implicit_coercion/,/^  end/ s:^:#:' test/core_ext/duration_test.rb || die
 
diff --git a/dev-ruby/activesupport/activesupport-7.0.4.2.ebuild b/dev-ruby/activesupport/activesupport-7.0.4-r1.ebuild
index f0801876283b..cf215798d810 100644
--- a/dev-ruby/activesupport/activesupport-7.0.4.2.ebuild
+++ b/dev-ruby/activesupport/activesupport-7.0.4-r1.ebuild
@@ -28,7 +28,7 @@ ruby_add_rdepend "
 	>=dev-ruby/concurrent-ruby-1.0.2:1
 	>=dev-ruby/i18n-1.6:1
 	dev-ruby/tzinfo:2
-	>=dev-ruby/minitest-5.1:5
+	<dev-ruby/minitest-5.16:*
 "
 
 # memcache-client, nokogiri, builder, and redis are not strictly needed,
@@ -42,7 +42,6 @@ ruby_add_bdepend "test? (
 	dev-ruby/rack
 	dev-ruby/rexml
 	dev-ruby/mocha
-	<dev-ruby/minitest-5.16:5
 	)"
 
 all_ruby_prepare() {
@@ -58,6 +57,8 @@ all_ruby_prepare() {
 		-e '5igem "builder"; gem "rack"' ../Gemfile || die
 	rm ../Gemfile.lock || die
 
+	sed -i -e '/minitest.*>= 5.1/s:.*:&, "< 5.16":' ${RUBY_FAKEGEM_GEMSPEC} || die
+
 	# Avoid test that depends on timezone
 	sed -i -e '/test_implicit_coercion/,/^  end/ s:^:#:' test/core_ext/duration_test.rb || die
 
diff --git a/dev-ruby/activesupport/activesupport-7.0.4.ebuild b/dev-ruby/activesupport/activesupport-7.0.4.2-r1.ebuild
index 1ae44774dde0..cf215798d810 100644
--- a/dev-ruby/activesupport/activesupport-7.0.4.ebuild
+++ b/dev-ruby/activesupport/activesupport-7.0.4.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -28,7 +28,7 @@ ruby_add_rdepend "
 	>=dev-ruby/concurrent-ruby-1.0.2:1
 	>=dev-ruby/i18n-1.6:1
 	dev-ruby/tzinfo:2
-	>=dev-ruby/minitest-5.1:5
+	<dev-ruby/minitest-5.16:*
 "
 
 # memcache-client, nokogiri, builder, and redis are not strictly needed,
@@ -42,7 +42,6 @@ ruby_add_bdepend "test? (
 	dev-ruby/rack
 	dev-ruby/rexml
 	dev-ruby/mocha
-	<dev-ruby/minitest-5.16:5
 	)"
 
 all_ruby_prepare() {
@@ -58,6 +57,8 @@ all_ruby_prepare() {
 		-e '5igem "builder"; gem "rack"' ../Gemfile || die
 	rm ../Gemfile.lock || die
 
+	sed -i -e '/minitest.*>= 5.1/s:.*:&, "< 5.16":' ${RUBY_FAKEGEM_GEMSPEC} || die
+
 	# Avoid test that depends on timezone
 	sed -i -e '/test_implicit_coercion/,/^  end/ s:^:#:' test/core_ext/duration_test.rb || die
 
diff --git a/dev-ruby/activesupport/activesupport-7.0.4.3.ebuild b/dev-ruby/activesupport/activesupport-7.0.4.3-r1.ebuild
index b8a341ae5558..a328f33b0256 100644
--- a/dev-ruby/activesupport/activesupport-7.0.4.3.ebuild
+++ b/dev-ruby/activesupport/activesupport-7.0.4.3-r1.ebuild
@@ -28,7 +28,7 @@ ruby_add_rdepend "
 	>=dev-ruby/concurrent-ruby-1.0.2:1
 	>=dev-ruby/i18n-1.6:1
 	dev-ruby/tzinfo:2
-	>=dev-ruby/minitest-5.1:5
+	<dev-ruby/minitest-5.16:*
 "
 
 # memcache-client, nokogiri, builder, and redis are not strictly needed,
@@ -42,7 +42,6 @@ ruby_add_bdepend "test? (
 	dev-ruby/rack
 	dev-ruby/rexml
 	dev-ruby/mocha
-	<dev-ruby/minitest-5.16:5
 	)"
 
 PATCHES=(
@@ -62,6 +61,8 @@ all_ruby_prepare() {
 		-e '5igem "builder"; gem "rack"' ../Gemfile || die
 	rm ../Gemfile.lock || die
 
+	sed -i -e '/minitest.*>= 5.1/s:.*:&, "< 5.16":' ${RUBY_FAKEGEM_GEMSPEC} || die
+
 	# Avoid test that depends on timezone
 	sed -i -e '/test_implicit_coercion/,/^  end/ s:^:#:' test/core_ext/duration_test.rb || die