7 files changed, 140 insertions, 3 deletions
diff --git a/dev-ruby/activesupport/activesupport-7.0.8.7-r1.ebuild b/dev-ruby/activesupport/activesupport-7.0.8.7-r1.ebuild
new file mode 100644
index 000000000000..548d0aec72f1
--- /dev/null
+++ b/dev-ruby/activesupport/activesupport-7.0.8.7-r1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="activesupport.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Utility Classes and Extension to the Standard Library"
+HOMEPAGE="https://github.com/rails/rails"
+SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="test"
+
+RUBY_S="rails-${PV}/${PN}"
+
+PATCHES=( "${FILESDIR}/${P}-logger.patch" )
+
+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
+"
+
+# memcache-client, nokogiri, builder, and redis are not strictly needed,
+# but there are tests using this code.
+ruby_add_bdepend "test? (
+	>=dev-ruby/dalli-3.0.1
+	dev-ruby/connection_pool
+	>=dev-ruby/nokogiri-1.8.1
+	>=dev-ruby/builder-3.1.0
+	>=dev-ruby/listen-3.3:3
+	dev-ruby/rack
+	dev-ruby/rexml
+	dev-ruby/mocha
+	dev-ruby/minitest
+	)"
+
+all_ruby_prepare() {
+	# Set the secure permissions that tests expect.
+	chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
+
+	# Remove items from the common Gemfile that we don't need for this
+	# test run. This also requires handling some gemspecs.
+	sed -i -e "/\(system_timer\|pg\|execjs\|jquery-rails\|mysql\|journey\|ruby-prof\|stackprof\|benchmark-ips\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|bcrypt\|uglifier\|minitest\|sprockets\|stackprof\|rack-cache\|sqlite\|websocket-client-simple\|\libxml-ruby\|bootsnap\|aws-sdk\|webmock\|capybara\|sass-rails\|selenium-webdriver\|webpacker\|webrick\|propshaft\|rack-test\|terser\|cgi\|net-smtp\|net-imap\|net-pop\|digest\|matrix\|readline-ext\)/ s:^:#:" \
+		-e '/stimulus-rails/,/tailwindcss-rails/ s:^:#:' \
+		-e '/group :\(doc\|rubocop\|job\|cable\|storage\|ujs\|test\|view\) do/,/^end/ s:^:#:' \
+		-e 's/gemspec/gemspec path: "activesupport"/' \
+		-e '5igem "builder"; gem "rack"' ../Gemfile || die
+	rm ../Gemfile.lock || die
+
+	# Avoid test that depends on timezone
+	sed -i -e '/test_implicit_coercion/,/^  end/ s:^:#:' test/core_ext/duration_test.rb || die
+
+	# Avoid tests that seem to trigger race conditions.
+	rm -f test/evented_file_update_checker_test.rb || die
+
+	# Avoid test that generates filename that is too long
+	sed -i -e '/test_filename_max_size/askip "gentoo"' test/cache/stores/file_store_test.rb || die
+
+	# Avoid tests requiring a live redis running
+	rm -f test/cache/stores/redis_cache_store_test.rb || die
+	sed -i -e '/cache_stores:redis/ s:^:#:' Rakefile || die
+	sed -i -e '/test_redis_cache_store/askip "lacking keywords"' test/cache/cache_store_setting_test.rb || die
+
+	# Avoid test where the result varies with specific ruby releases.
+	rm -f test/core_ext/object/duplicable_test.rb || die
+}
diff --git a/dev-ruby/activesupport/files/activesupport-7.0.8.7-logger.patch b/dev-ruby/activesupport/files/activesupport-7.0.8.7-logger.patch
new file mode 100644
index 000000000000..922f4fc33c35
--- /dev/null
+++ b/dev-ruby/activesupport/files/activesupport-7.0.8.7-logger.patch
@@ -0,0 +1,22 @@
+From 6a7c72c078715380bf24f029624e6b1fb3035c97 Mon Sep 17 00:00:00 2001
+From: Antti Hukkanen <antti.hukkanen@mainiotech.fi>
+Date: Thu, 16 Jan 2025 11:17:29 +0200
+Subject: [PATCH] Ensure the logger gem is loaded in Rails 7.0
+
+Fix #54260, #54263
+---
+ activesupport/lib/active_support/logger_thread_safe_level.rb | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/activesupport/lib/active_support/logger_thread_safe_level.rb b/activesupport/lib/active_support/logger_thread_safe_level.rb
+index 042f484f8210d..aa84a7c5de5c6 100644
+--- a/lib/active_support/logger_thread_safe_level.rb
++++ b/lib/active_support/logger_thread_safe_level.rb
+@@ -4,6 +4,7 @@
+ require "active_support/core_ext/module/attribute_accessors"
+ require "concurrent"
+ require "fiber"
++require "logger"
+ 
+ module ActiveSupport
+   module LoggerThreadSafeLevel # :nodoc:
diff --git a/dev-ruby/hitimes/Manifest b/dev-ruby/hitimes/Manifest
index 61e0e656a617..33b05f971560 100644
--- a/dev-ruby/hitimes/Manifest
+++ b/dev-ruby/hitimes/Manifest
@@ -1,2 +1,3 @@
 DIST hitimes-2.0.0.gem 27136 BLAKE2B e2bab57b70d63f3b2bbe29584b7051f6c829f7957da483fd83b38ffee4d5f6a8c1af16c2ee8aa71d56ee71160e7df87a46e420d70d0430e514ead6576453fc7e SHA512 06f1c17d9914054bc17244f1a22761c98f7409cb401136e582deec18bbee07358b339ddd49ddfbc01cf9eb46bf84fbf5e2dccd6c77eb36e98c357e99687e8201
 DIST hitimes-3.0.0.tar.gz 28269 BLAKE2B 3ff4299484cc859763e4e25bb1bb25293cc2e956e48469f87a517da86313fc92912f2dab4174ac0474c0226bdb76d4dd9b4a3a88f480eb3325eaeee19a7d1dd9 SHA512 e2311b58d5b44d45e754b4a9116fd371a4435356c207bea3484b2eff8d3f06f8ceb13fc51eb76e2bd040febfe75f8ce1c1b78135a351a5f7d93ad28f1f129b33
+DIST hitimes-3.1.0.tar.gz 31555 BLAKE2B 7a6fc67204519097bb9084ac2b535bb543622724c94fbeef6610cfb65b06bb814f5cd8b805e9d71bb5d54488bde7a9b831db3f132d2c2f1fd2ec80cebe25ccbe SHA512 f94fe83d54934c936a146e8cd799b7f96e02d8976acda8bebe4c686619cb5de204a3d98a2b22bf6a029556f2d753bd42f6567ace4fbb46ca0357737d0d91aba6
diff --git a/dev-ruby/hitimes/hitimes-3.1.0.ebuild b/dev-ruby/hitimes/hitimes-3.1.0.ebuild
new file mode 100644
index 000000000000..a02236cc57bc
--- /dev/null
+++ b/dev-ruby/hitimes/hitimes-3.1.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33 ruby34"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRADOC="README.md HISTORY.md"
+RUBY_FAKEGEM_GEMSPEC="hitimes.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A fast, high resolution timer library"
+HOMEPAGE="https://github.com/copiousfreetime/hitimes"
+SRC_URI="https://github.com/copiousfreetime/hitimes/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="test"
+
+ruby_add_bdepend "test? ( dev-ruby/minitest )"
+
+all_ruby_prepare() {
+	sed -e '/\(focus\|pride\)/ s:^:#:' \
+		-i spec/spec_helper.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:spec:. -rminitest/autorun -e 'Dir["spec/*_spec.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/launchy/Manifest b/dev-ruby/launchy/Manifest
index 287413e9a024..5d7362bbdb28 100644
--- a/dev-ruby/launchy/Manifest
+++ b/dev-ruby/launchy/Manifest
@@ -1,3 +1,3 @@
 DIST launchy-2.5.2.gem 30208 BLAKE2B 7e3c3464292026a93953995c5df7dd407b51bd36b363bb0c57fed6ebf2122390348f415273b6ce7ee2dcb89bd444a58458c0a95b84428fec02280654239223e0 SHA512 40777dabd25e6646c6673b33d9d296b66de7976fdf7454c9a7ae809a161ed992572b2232d94591731a7c8405875803172c6fafd09a5570f09e5eb119e23e7773
-DIST launchy-3.0.0.gem 27648 BLAKE2B 71fb8dadc37d9b25f861177c6579c9328786d16e64758d24ca297c8b6a773d307abd26b674c221b9a6318a2edd56e90d889fcf66cb1e3c279d85d045e9b1243d SHA512 6c4a8c320b4d149a3ab322f9cc03c73b7decb50d8dd2a8954bae27f5d265594fc6498af4a3d41a0693d232cbdce3dbbdf76cba3da2199a4bc85d8cda60e59187
 DIST launchy-3.0.1.tar.gz 26613 BLAKE2B 4646fa7eef280fe439c513e1780ff80bf97eb2d084ca9a35d583568a1babbc2c85abb951382dceffbf08986b9cae07bea56078fd437097c6b1f5816e9cf4bba5 SHA512 98ec8f0389da8bc56491f4cda4fc128184a09f923bc7c0c7b2275a505f9af074172754abbbd5e9c48680c26fac5d10c23b9fee3e14af1e73dc176b3793ff2311
+DIST launchy-3.1.0.tar.gz 29520 BLAKE2B 612a3ced84942d38cc1e22b37555499f4eb8f0306bd336a6e7dd40d12420e7c104102645a4f6d4ac20840680f76ef6f828e98a7a4ff7f50af0e1ad82d347a7b4 SHA512 08e5c314d9677ce6de8c7b05a844a39493aaafc1c165204a1315f94099dba3a313c4bd0fe908114032b86c55c28e680a09f67166fa4b0fdc0d310a90dc2a9254
diff --git a/dev-ruby/launchy/launchy-3.0.0.ebuild b/dev-ruby/launchy/launchy-3.1.0.ebuild
index 87bd934b6635..98f9f10f4ffb 100644
--- a/dev-ruby/launchy/launchy-3.0.0.ebuild
+++ b/dev-ruby/launchy/launchy-3.1.0.ebuild
@@ -1,15 +1,18 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 USE_RUBY="ruby31 ruby32 ruby33"
 
+RUBY_FAKEGEM_BINWRAP=""
 RUBY_FAKEGEM_EXTRADOC="README.md HISTORY.md"
+RUBY_FAKEGEM_GEMSPEC="launchy.gemspec"
 
 inherit ruby-fakegem virtualx
 
 DESCRIPTION="Helper class for launching cross-platform applications"
 HOMEPAGE="https://github.com/copiousfreetime/launchy"
+SRC_URI="https://github.com/copiousfreetime/launchy/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="ISC"
 
@@ -20,6 +23,7 @@ IUSE="test"
 ruby_add_rdepend "
 	>=dev-ruby/addressable-2.8
 	dev-ruby/childprocess:5
+	>=dev-ruby/logger-1.6:0
 	!<dev-ruby/launchy-2.5.2-r1
 "
 
diff --git a/dev-ruby/net-scp/net-scp-4.1.0.ebuild b/dev-ruby/net-scp/net-scp-4.1.0.ebuild
index f6de19ff6334..ffcbb93f544f 100644
--- a/dev-ruby/net-scp/net-scp-4.1.0.ebuild
+++ b/dev-ruby/net-scp/net-scp-4.1.0.ebuild
@@ -26,7 +26,7 @@ RESTRICT="!test? ( test )"
 ruby_add_bdepend "
 	doc? ( dev-ruby/net-ssh:7 )
 	test? (
-		<dev-ruby/mocha-2.2.0:2
+		dev-ruby/mocha:2
 		dev-ruby/test-unit
 	)"