4 files changed, 43 insertions, 37 deletions
diff --git a/dev-ruby/gh/files/gh-0.18.0-ruby30.patch b/dev-ruby/gh/files/gh-0.18.0-ruby30.patch
new file mode 100644
index 000000000000..cdd4aba84d59
--- /dev/null
+++ b/dev-ruby/gh/files/gh-0.18.0-ruby30.patch
@@ -0,0 +1,20 @@
+--- a/spec/token_check_spec.rb	2020-06-25 16:44:11.000000000 +0200
++++ b/spec/token_check_spec.rb	2023-03-27 16:20:56.781510771 +0200
+@@ -8,7 +8,7 @@
+   end
+ 
+   it 'adds client_id and client_secret to a request' do
+-    expect(subject.backend).to receive(:http).with(:post, "/applications/foo/token", :body => "{\"access_token\": \"baz\"}", "Authorization" => "Basic Zm9vOmJhcg==") do
++    expect(subject.backend).to receive(:http).with(:post, "/applications/foo/token", { :body => "{\"access_token\": \"baz\"}", "Authorization" => "Basic Zm9vOmJhcg==" }) do
+       error = GH::Error.new
+       error.info[:response_status] = 404
+       raise error
+@@ -17,7 +17,7 @@
+   end
+ 
+   it 'does not swallow other status codes' do
+-    expect(subject.backend).to receive(:http).with(:post, "/applications/foo/token", :body => "{\"access_token\": \"baz\"}", "Authorization" => "Basic Zm9vOmJhcg==") do
++    expect(subject.backend).to receive(:http).with(:post, "/applications/foo/token", { :body => "{\"access_token\": \"baz\"}", "Authorization" => "Basic Zm9vOmJhcg==" }) do
+       error = GH::Error.new
+       error.info[:response_status] = 500
+       raise error
diff --git a/dev-ruby/liquid/files/liquid-4.0.3-ruby30.patch b/dev-ruby/liquid/files/liquid-4.0.3-ruby30.patch
new file mode 100644
index 000000000000..a25f4e217929
--- /dev/null
+++ b/dev-ruby/liquid/files/liquid-4.0.3-ruby30.patch
@@ -0,0 +1,23 @@
+From abfcec9a57543d9e1bdda7dab195607f8574d8b4 Mon Sep 17 00:00:00 2001
+From: Dylan Thacker-Smith <Dylan.Smith@shopify.com>
+Date: Tue, 31 Mar 2020 10:19:25 -0400
+Subject: [PATCH] Fix ParseTreeVisitorTest for ruby 3 compatibility
+
+(cherry picked from commit 81149344a5ba53b30e8ab7d77d605dc484a0a3ff)
+---
+ test/integration/parse_tree_visitor_test.rb | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/integration/parse_tree_visitor_test.rb b/test/integration/parse_tree_visitor_test.rb
+index 6ad6a2d00..933dbc3b0 100644
+--- a/test/integration/parse_tree_visitor_test.rb
++++ b/test/integration/parse_tree_visitor_test.rb
+@@ -238,7 +238,7 @@ def test_preserve_tree_structure
+   def traversal(template)
+     ParseTreeVisitor
+       .for(Template.parse(template).root)
+-      .add_callback_for(VariableLookup, &:name)
++      .add_callback_for(VariableLookup) { |node| node.name } # rubocop:disable Style/SymbolProc
+   end
+ 
+   def visit(template)
diff --git a/dev-ruby/propshaft/Manifest b/dev-ruby/propshaft/Manifest
index efd6211c09ed..23844dc84e8d 100644
--- a/dev-ruby/propshaft/Manifest
+++ b/dev-ruby/propshaft/Manifest
@@ -1,3 +1,2 @@
-DIST propshaft-0.6.1-git.tgz 245087 BLAKE2B 6e04ebc0315c263f79dbfc9f836b270b8b693e1a7e332a97d8abe5cc6555d0acc9efe3ae7979c901ca2c502460e8ee67b83420863d5dabdf50fbc2028aacd5b9 SHA512 35600b7e051810c7f0798f29faab7c7bcabf04198fc56ee9a4492d18ddfabf543cfbf11c28f35eb5e2a64eb57c65b95567e00441852ac0f29d8538ad8d5cb1b4
 DIST propshaft-0.6.4-git.tgz 245384 BLAKE2B 8089c7ee8f8d41f761a31bcd4751899da86302cdf7e1d5a9ba673e8a64431b0e35bbfa7d09fb0caa5ca06457b7134f27c3f37ade213922d616b374adac9824c5 SHA512 3302e1a0ef4bd47094566b393db77f1181e3e3b67c08b18694cea48b4518a45893dc16238ce1d86965d0b37894069ddbe7040392e7cdcad5caa80d7ff86bf2eb
 DIST propshaft-0.7.0-git.tgz 247111 BLAKE2B aecf4dcab9b57f1933e8f7066f4b229348cf60e4104cc82e14edb945e797a263012fe5b7b65de8ff0165e652256a0bd8fba24af8f08d8e9391050e36e56d5f31 SHA512 3d6dba7a3b5b522f3e4a9f43dc6b9981fbb475374be0b90c8abb2f19c587d025b58876ddb6a9e1b9992e3f357a96b50b6138173d10b8ae131e9457309b8cc0c9
diff --git a/dev-ruby/propshaft/propshaft-0.6.1.ebuild b/dev-ruby/propshaft/propshaft-0.6.1.ebuild
deleted file mode 100644
index 7bfc73881f6a..000000000000
--- a/dev-ruby/propshaft/propshaft-0.6.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby27"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="propshaft.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Deliver assets for Rails"
-HOMEPAGE="https://github.com/rails/propshaft"
-SRC_URI="https://github.com/rails/propshaft/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64"
-
-IUSE=""
-
-ruby_add_rdepend "
-	>=dev-ruby/actionpack-7.0.0:*
-	>=dev-ruby/activesupport-7.0.0:*
-	dev-ruby/rack:*
-	>=dev-ruby/railties-7.0.0:*
-"
-
-all_ruby_prepare() {
-	rm -f Gemfile.lock || die
-	sed -i -e '/debug/ s:^:#:' Gemfile || die
-
-	sed -i -e 's:_relative ": "./:' ${RUBY_FAKEGEM_GEMSPEC} || die
-}