8 files changed, 34 insertions, 103 deletions
diff --git a/dev-ruby/liquid/Manifest b/dev-ruby/liquid/Manifest
index 9296d70ace29..5a4897c0df9d 100644
--- a/dev-ruby/liquid/Manifest
+++ b/dev-ruby/liquid/Manifest
@@ -1,5 +1,3 @@
 DIST liquid-4.0.3.tar.gz 102242 BLAKE2B 4a025fd8501e237f7619ed989e185a6c55a234577c99423857a826b616c40625c1fd205d998a368488306a88c0b84fc3d3ac59bd01c1231055aa9f60a3d14338 SHA512 5aed3b98fa486a00744e0225f7a3b8004be8ded1e3347f9118fd062684fe33b725b84d1f88bdd5e881399e6efa60b4aa32f57cf10f4583aa27ec8c8288b52bf9
-DIST liquid-5.0.1.tar.gz 115523 BLAKE2B 52194481aef296785812a76979ee215e5adffbb73c4dd80de8f8dfb6995757d22a698a6acb950281f69cec32c2c06ba51fe273ba54c7454f308f5547faa9e1cf SHA512 e82fe4b67c338ef2e13652d2c5ba5d52e968c368aff724516a8ed2c157d149441fe73c66be866c0283fbd3472aeb83fec710f77afa1a92dca3206b5c8059ccf4
-DIST liquid-5.1.0.tar.gz 117155 BLAKE2B 93c609e71773b3e002134bb6caf75b43f57428aa71a9181d0a986d920490dc7246fe89cb48d54e6ac880cb28b70fd9cdf8e1a81c7df9061803880eee82ff3cf2 SHA512 27ff4392ffcd05cd11c3f104b0ee875e6043dcf057ae06fe7037dcaef528b01c3aba31df65dc4d7b41f89afeee322d3045d09fe7d1e4ec9dafe52a17b6cad672
-DIST liquid-5.2.0.tar.gz 117804 BLAKE2B bf9027265ea9e31cdb029032384ad7078f28f0aebad21538c8271d7b44aade95bb2be642443b84a0ab35907a81b30dacdfc51c0593226eb9e37b85738c4bb9d8 SHA512 69297fb5cc3ea86b47c24a0ae1f3f7ae7d4e377b0909531362fdda298c5dbc2fd4a8666baf5b462cef04278b1ed6758312f93ebb5d5b266fcbbdbc82a8288047
-DIST liquid-5.3.0.tar.gz 118704 BLAKE2B 3c7670717ea70f971a80a932e8aef24670017e9fceb9164403035a6137b4ba8a3dd77b396037fd52db71e4989a74d89b2ed63150290ba7326d35d0970a014b39 SHA512 bf295a882535b6f70f36adc62dc207ec07222e201c16adf2b56be9decf63f4f262b4e8cd31539eedf4364d6394b0136091eefcf26ee705987e82c2bf1ccf2739
+DIST liquid-5.4.0.tar.gz 123661 BLAKE2B 96fbd0d92408e1deecfd198de4ab59287820e4f8d6e8cfeb080163781c82421a1fe5286354136a787db244c3821fd3e470d2ecdcddbde3344aa71be79799894d SHA512 45b394aa945206b200a2aa30e2e0b0f0937e7e59bd213f45f0484f2f6f3d68fca96f93a7ae64ac05249439048842b53e20a58d73be88470ed94cf40cc65c4cfb
+DIST liquid-5.5.0.tar.gz 129799 BLAKE2B d46c93ca0d968b080d1bda363badb629499fa3db6aeec0c73dc7c60ba82e70f478cf136ceddb3d600dae4e2645e9a6d61521695515f0cf5253c99d3e006bce98 SHA512 6afa798052371356100a22936ba716e285302080111e833ba48927bc63b358e6d6d8fe027ad6410d2171bef59f71e30f7ddd414bda3e45c91a0e2e459aa4919e
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/liquid/liquid-4.0.3-r1.ebuild b/dev-ruby/liquid/liquid-4.0.3-r1.ebuild
index ab4cb72ca648..639c5768b21c 100644
--- a/dev-ruby/liquid/liquid-4.0.3-r1.ebuild
+++ b/dev-ruby/liquid/liquid-4.0.3-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27"
+USE_RUBY="ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="History.md README.md"
@@ -19,6 +19,8 @@ SLOT="4"
 KEYWORDS="~amd64 ~arm64"
 IUSE=""
 
+PATCHES=( "${FILESDIR}/${P}-ruby30.patch" )
+
 ruby_add_bdepend "test? ( dev-ruby/minitest
 	dev-ruby/spy )"
 
diff --git a/dev-ruby/liquid/liquid-4.0.3.ebuild b/dev-ruby/liquid/liquid-4.0.3.ebuild
deleted file mode 100644
index 9dbef8117cb5..000000000000
--- a/dev-ruby/liquid/liquid-4.0.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="History.md README.md"
-
-inherit ruby-fakegem
-
-SRC_URI="https://github.com/Shopify/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-DESCRIPTION="Template engine for Ruby"
-HOMEPAGE="https://shopify.github.io/liquid/"
-
-LICENSE="MIT"
-SLOT="4"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/minitest
-	dev-ruby/spy )"
-
-all_ruby_prepare() {
-	# liquid-c is not packaged
-	sed -i -e '/LIQUID-C/ s:^:#:' Rakefile || die
-
-	# Avoid test requiring unpackaged stackprof
-	sed -i -e '/assert_no_object_allocations/askip "unpackaged stackprof"' test/unit/context_unit_test.rb
-}
diff --git a/dev-ruby/liquid/liquid-5.0.1.ebuild b/dev-ruby/liquid/liquid-5.0.1.ebuild
deleted file mode 100644
index 9b9aa14a586f..000000000000
--- a/dev-ruby/liquid/liquid-5.0.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="History.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="liquid.gemspec"
-
-inherit ruby-fakegem
-
-SRC_URI="https://github.com/Shopify/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-DESCRIPTION="Template engine for Ruby"
-HOMEPAGE="https://shopify.github.io/liquid/"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/minitest )"
-
-all_ruby_prepare() {
-	# liquid-c is not packaged
-	sed -i -e '/LIQUID_C/ s:^:#:' Rakefile || die
-
-	# Avoid test requiring unpackaged stackprof
-	sed -i -e '/assert_no_object_allocations/askip "unpackaged stackprof"' test/integration/context_test.rb || die
-}
diff --git a/dev-ruby/liquid/liquid-5.2.0.ebuild b/dev-ruby/liquid/liquid-5.2.0.ebuild
deleted file mode 100644
index dc56f982f6bc..000000000000
--- a/dev-ruby/liquid/liquid-5.2.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="History.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="liquid.gemspec"
-
-inherit ruby-fakegem
-
-SRC_URI="https://github.com/Shopify/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-DESCRIPTION="Template engine for Ruby"
-HOMEPAGE="https://shopify.github.io/liquid/"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/minitest )"
-
-all_ruby_prepare() {
-	# liquid-c is not packaged
-	sed -i -e '/LIQUID_C/ s:^:#:' Rakefile || die
-
-	# Avoid test requiring unpackaged stackprof
-	sed -i -e '/assert_no_object_allocations/askip "unpackaged stackprof"' test/integration/context_test.rb || die
-}
diff --git a/dev-ruby/liquid/liquid-5.1.0.ebuild b/dev-ruby/liquid/liquid-5.4.0.ebuild
index 38343a72cfc3..ad5ef185e795 100644
--- a/dev-ruby/liquid/liquid-5.1.0.ebuild
+++ b/dev-ruby/liquid/liquid-5.4.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="History.md README.md"
diff --git a/dev-ruby/liquid/liquid-5.3.0.ebuild b/dev-ruby/liquid/liquid-5.5.0.ebuild
index dc56f982f6bc..5db3f91925e7 100644
--- a/dev-ruby/liquid/liquid-5.3.0.ebuild
+++ b/dev-ruby/liquid/liquid-5.5.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="History.md README.md"
@@ -18,7 +18,7 @@ HOMEPAGE="https://shopify.github.io/liquid/"
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
 KEYWORDS="~amd64 ~arm64"
-IUSE=""
+IUSE="test"
 
 ruby_add_bdepend "test? ( dev-ruby/minitest )"