10 files changed, 145 insertions, 61 deletions
diff --git a/dev-ruby/arel-helpers/Manifest b/dev-ruby/arel-helpers/Manifest
index dbf29ab45400..e277cf02ed15 100644
--- a/dev-ruby/arel-helpers/Manifest
+++ b/dev-ruby/arel-helpers/Manifest
@@ -1 +1,2 @@
 DIST arel-helpers-2.16.0.tar.gz 11845 BLAKE2B 584ecaf16b19274674e92a524a256d3045b9007683123c8bf7bc73d02ec91be8513c4a1c0eff5e0be094db74772b31b0afd4186fb5950914d5d9d76348cc8f0e SHA512 b1d9b74c0082fabd4cf79c43d79f53a2e46e4647d5fbe05bdcdb3821692a46a15a1d6418c24155838c739e83c646f9af0c636b99bfc4f84c6355792c959fae8b
+DIST arel-helpers-2.17.0.tar.gz 12008 BLAKE2B 774311b13542e6a5659d89a8957566567f31419117612cd5445e5ee807a4980b036a980af8137749b09cd1c09e04d6d342bb8106c2068da8671150e8dd6d5e35 SHA512 05baf21b49550e4ef21ae73316641527ba39b383cbd5267bb5a3733060e105229d26e0d6fd11f5c7870893d386ab5e36032d5550fdb29624a24d356989e091cc
diff --git a/dev-ruby/arel-helpers/arel-helpers-2.17.0.ebuild b/dev-ruby/arel-helpers/arel-helpers-2.17.0.ebuild
new file mode 100644
index 000000000000..2610fd048f65
--- /dev/null
+++ b/dev-ruby/arel-helpers/arel-helpers-2.17.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+RUBY_S=${PN}-*
+RUBY_FAKEGEM_VERSION="$(ver_cut 1-3)"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Tools to help construct database queries"
+HOMEPAGE="https://github.com/camertron/arel-helpers"
+# No test data in gems
+SRC_URI="https://github.com/camertron/arel-helpers/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm"
+
+ruby_add_rdepend "
+	|| (
+		dev-ruby/activerecord:8.1
+		dev-ruby/activerecord:8.0
+		dev-ruby/activerecord:7.2
+		dev-ruby/activerecord:7.1
+	)
+"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/rr
+		dev-ruby/activerecord[sqlite]
+		dev-ruby/bundler
+		>=dev-ruby/combustion-1.3
+		>=dev-ruby/database_cleaner-2.0
+		>=dev-ruby/sqlite3-1.4
+	)
+"
+
+all_ruby_prepare() {
+	# pry is for debugging, not useful here
+	sed -e '/pry-/ s:^:#:' \
+		-i spec/spec_helper.rb || die
+
+	sed -e '2igem "activerecord", "<8.2"' \
+		-i Gemfile || die
+
+	sed \
+		-e '/rake/ s/~>/>=/' \
+		-e '/appraisal/ s:^:#:' \
+		-e '/database_cleaner/ s/1.8/1.7/' \
+		-e '/database_cleaner/ s/~>/>=/' \
+		-e '/sqlite3/ s/~>/>=/' \
+		-i arel-helpers.gemspec || die
+}
+
+each_ruby_test() {
+	${RUBY} -S bundle exec rake spec || die
+}
diff --git a/dev-ruby/chef-utils/Manifest b/dev-ruby/chef-utils/Manifest
index 0f00a0e866fe..e1d3d9b02151 100644
--- a/dev-ruby/chef-utils/Manifest
+++ b/dev-ruby/chef-utils/Manifest
@@ -1,3 +1,4 @@
 DIST chef-utils-18.7.10.gem 34816 BLAKE2B 668e641fd20083949322e0cf7258ed324a9c3cc3329ab9c1409a34524e296a3d1f9e96141e4a7dcbe2390b3f9197883676c5e5a200a584f14e1d9f480e28b52c SHA512 5e55ce40a929f9a62468cc41661cdfa61d0ea47f725379d5774fa731ff2def050ceaa303f3ed89eaf1b216d481a1fb3163697bc59bd621c3f2e33ffb3d061032
 DIST chef-utils-18.8.11.gem 34816 BLAKE2B d2fea0a96a01920ffd55182d28ff19a0aa83a222544c1f570fb6cad922a516195335469ad86c8ed85f2ee61e47e595205ea6dea6216bebc47756eba7a56bd5d0 SHA512 bb35dd4dae6d6a5112d36498f4468a0dc204c5be823de28fc3cce39af9a52a7e3673c130f876089ec7a826e42f778d029cb71a346858eb10b1b8909613f694a8
 DIST chef-utils-18.8.46.gem 34816 BLAKE2B beba2cba417fabe64797c8db8bc333f612fba52e2760941f75295bab43a0e6e3acb68b460fda5d909f48936ed84f6377f6073399b72376e195c9353e00eacadc SHA512 2ee2436e9a39e3ddca52226c9b3bf61672f336c1148bd9133ea45077509ed89a734b28500fe697707176e82c8880f314b18e6f498ab31c004dce041dda80cadd
+DIST chef-utils-18.8.54.gem 34816 BLAKE2B d754d0ecae60416cff8be94fce3a42f669b1fc502d0df3399e375ecc2f2a1bc684997ddb42fd2f21f892dcb7de6b540d4a4a8e37f2cdc0c4e0435ec2e9c9aa5e SHA512 ab925f5c41bbad71e5f2ebe024f7b50e41f546418756e095a65941410ceec3c56dd1c5e104f649b464d24d968ce5ca233e9ae53dec532784584343d0deb1ddd9
diff --git a/dev-ruby/chef-utils/chef-utils-18.8.54.ebuild b/dev-ruby/chef-utils/chef-utils-18.8.54.ebuild
new file mode 100644
index 000000000000..ed203e8746e6
--- /dev/null
+++ b/dev-ruby/chef-utils/chef-utils-18.8.54.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby32 ruby33 ruby34"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRA_DOC="CHANGELOG.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Basic utility functions for Core Chef Infra development"
+HOMEPAGE="https://github.com/chef/chef/tree/main/chef-utils"
+
+LICENSE="Apache-2.0"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~x86"
+
+ruby_add_rdepend "dev-ruby/concurrent-ruby"
+
+all_ruby_prepare() {
+	# Avoid specs depending on unpackaged fauxhai
+	rm -f spec/unit/dsl/{cloud,os,platform,platform_family,virtualization}_spec.rb || die
+}
diff --git a/dev-ruby/combustion/combustion-1.5.0.ebuild b/dev-ruby/combustion/combustion-1.5.0.ebuild
index fb1f9e17e7f8..f45c82f52e0a 100644
--- a/dev-ruby/combustion/combustion-1.5.0.ebuild
+++ b/dev-ruby/combustion/combustion-1.5.0.ebuild
@@ -1,12 +1,14 @@
-# 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"
+USE_RUBY="ruby32 ruby33 ruby34"
+
 RUBY_FAKEGEM_BINWRAP=""
 RUBY_FAKEGEM_EXTRADOC="README.md"
 RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
 inherit ruby-fakegem
 
 DESCRIPTION="Elegant Rails Engine Testing"
@@ -27,7 +29,7 @@ ruby_add_bdepend "
 	test? (
 		>=dev-ruby/activemodel-3.0.0:*
 		>=dev-ruby/activerecord-3.0.0:*[sqlite]
-		>=dev-ruby/sqlite3-1.4:0
+		dev-ruby/sqlite3:2
 		dev-ruby/bundler
 		dev-ruby/net-smtp
 		>=dev-ruby/rails-3.0.0:*
@@ -38,6 +40,7 @@ ruby_add_bdepend "
 each_ruby_prepare() {
 	sed -i \
 		-e '/rubocop/d' \
+		-e '/sqlite/ s/1.4/2.0/' \
 		Gemfile || die
 
 	# appraisal, rubocop: useless for us test deps
diff --git a/dev-ruby/json/Manifest b/dev-ruby/json/Manifest
index 34328c04922b..42e6067ea908 100644
--- a/dev-ruby/json/Manifest
+++ b/dev-ruby/json/Manifest
@@ -2,6 +2,5 @@ DIST json-2.10.2.tar.gz 834578 BLAKE2B 2225e515e2df5ec66985ca3e73ff0e9cd68025c29
 DIST json-2.12.2.tar.gz 848560 BLAKE2B 489660e253a40c4274cc7d1c45a959a32674d2bab32fc9d16820744d6acdd0ef07cddafa586e7b1266815d68c5dc3b8a50a75242cd18d6f0503cfa6ad065bb0a SHA512 ccaf9813fb51f735d0961b97ccb6f71d9c0124d3b179dc936664b502dd2136fe48df16cc0b2384bbb46d514f29ef0241ee7bcbea5677e608935a63c8a9dacf6e
 DIST json-2.13.2.tar.gz 851603 BLAKE2B 9770e4892514f370c34c043582e519ba68a077eb246cd3a7164056572aca1570754362b7cf7cb5e2d39afa0204913d19b1bdb32b6b34253c910736940ac4793d SHA512 62a48257ccd7a34accd9926fe1e6d2ca2599eb86e7bf5239b473603ec4fc00928c56f46b8bae75880b62df3a9a8a4fb9000b61319a1b0a1987cfc9bde1422fa7
 DIST json-2.14.1.tar.gz 855875 BLAKE2B f989da0cf149f60b2539d36f54ad1b423033c42da140abc375990a43db0a76bb6b9277c4fbae77d524e64f314311b7eeef0eed896f3acaf30cfaf3b4706d3709 SHA512 82aedfce4c838ef177c5fdbc87107787343d22b1f333d44aef8cb77ed586d50d02128be2c8f3eaa8dcc9423ea46cad51667538fd72845566cf89c12229aa1c0e
-DIST json-2.15.0.tar.gz 856404 BLAKE2B 89a9409b678afa87cdf90da5c37e688d0ec78869c35803c3a31fee74b337b014f5c71fb0bc8b17d5d3f012e103450da17dfd5fa331adbc0d86db217c452eccb4 SHA512 5008c9c548ae60a142afeb852dda062047400fb8a6fcdcf5e50f38ec094d922a20c4197c04587c9de1849d8bb841bb1e9a73c126fbc8b3fb16dfd377876e95a0
-DIST json-2.15.1.tar.gz 856795 BLAKE2B 814459f9628b02c6d788cc9ce82c53ce62b6d351100d499e5792cef53822c14d1cfc11882065508930322c0ca32482ad7e2ed64b2d07bf35ae6e6fb8b6ed8b03 SHA512 aa14367863eb79fdbe3bab0a8d69440e1e463663513e2737995ce940d1ae8795489d13026682b1557f0f1d534421a166731dd0172d7f64f3186da4ea7d48c118
 DIST json-2.15.2.tar.gz 857225 BLAKE2B 882854d354524bfa319cd20b8f18f854563323c831ab2d23e698eae8280e2166c7861173934897ea05ce05dff0cb9e0f3f80537278ca0b16d373a070f2e76b58 SHA512 320e5a6e56829fe32c73e6d0bb6a850fb5e9f123bec01f935ace892350c99e7e94f5bca3d98408ae83bc22f2aa96adc150da727dda7372b92877c2d2e6a91b56
+DIST json-2.16.0.tar.gz 885987 BLAKE2B 36dd95d95ea1e2ac1c6d8458c7eb61825725af1f0e99f956f4df15c336e2d0f6a4934aecfd4c1d44f540dc4fa89310224212e577957e35068bc0329060954526 SHA512 4bad117d09fa854e20bbf02baf0b83a66aac7d4a573fbb4bbe61bfcb27ba47d76bb2d9ef11bc6c6077e04bb5a7cf1d0ac2e4e083f0c8820a89fcba667870896e
diff --git a/dev-ruby/json/json-2.15.0.ebuild b/dev-ruby/json/json-2.15.0.ebuild
deleted file mode 100644
index 35899578f2ec..000000000000
--- a/dev-ruby/json/json-2.15.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby32 ruby33 ruby34"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
-RUBY_FAKEGEM_DOCDIR="doc"
-
-RUBY_FAKEGEM_GEMSPEC="json.gemspec"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/json/ext/parser/extconf.rb ext/json/ext/generator/extconf.rb)
-RUBY_FAKEGEM_EXTENSION_LIBDIR=lib/json/ext
-
-inherit ruby-fakegem
-
-DESCRIPTION="A JSON implementation as a Ruby extension"
-HOMEPAGE="https://github.com/ruby/json"
-SRC_URI="https://github.com/ruby/json/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="|| ( BSD-2 Ruby )"
-
-SLOT="$(ver_cut 1)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="doc test"
-
-DEPEND="dev-util/ragel"
-
-ruby_add_bdepend "dev-ruby/rake
-	doc? ( dev-ruby/rdoc )
-	test? (
-		dev-ruby/test-unit:2
-		dev-ruby/test-unit-ruby-core
-	)"
-
-all_ruby_prepare() {
-	# Avoid building the extension twice!
-	# And use rdoc instead of sdoc which we don't have packaged
-	# And don't call git to list files. We're using the pregenerated spec anyway.
-	sed -i \
-		-e '/task :test/ s|:compile||' \
-		-e 's| => :clean||' \
-		-e 's|sdoc|rdoc|' \
-		-e 's|`git ls-files`|""|' \
-		-e '/extensiontask/I s:^:#:' \
-		Rakefile || die "rakefile fix failed"
-
-	sed -e 's/__dir__/"."/' \
-		-i ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Avoid setting gem since it will not be available yet when installing
-	sed -i -e '/gem/ s:^:#:' test/json/test_helper.rb || die
-
-	# Fix version number
-	sed -e 's/2.8.2/2.9.0/' -i lib/json/version.rb || die
-}
diff --git a/dev-ruby/json/json-2.15.1.ebuild b/dev-ruby/json/json-2.16.0.ebuild
index 43b3a77483b8..43b3a77483b8 100644
--- a/dev-ruby/json/json-2.15.1.ebuild
+++ b/dev-ruby/json/json-2.16.0.ebuild
diff --git a/dev-ruby/liquid/Manifest b/dev-ruby/liquid/Manifest
index d64e29699186..70955c3d2419 100644
--- a/dev-ruby/liquid/Manifest
+++ b/dev-ruby/liquid/Manifest
@@ -1,4 +1,5 @@
 DIST liquid-4.0.4.tar.gz 102376 BLAKE2B 034c1635556455b41911230e03329f2e817562c9de91ad6cf94ec96f997293927b3c4c6cf4b3db6f778bb5b8a94c8727175d57a60ed8c5db562269f2d8e4d7ed SHA512 8c7a674ea7f7542f3a57e57235f1252d1177794fe2108463d29fb91efec68ac6e3cc2df5efe865afa47b34dbfce5bb4326d9cd661786429e8985b320671c6d23
+DIST liquid-5.10.0.tar.gz 151445 BLAKE2B 4b7289767433ef1df62aa3a5f113ebb403cc60b4718e5a3d8b3aa798ff3a297dfcd52a0cada74b41557354947e211b2b51f82b4cf664df7c3cfa2d0fc1f2b5bf SHA512 f1889e48b82df1b89de4a8dac8f32565f5754c0edb950f165c97c8709f5525acf969071d98ed43da9fd0cfaeded7890eb1e6bb1769d4ae324143194537cdfb00
 DIST liquid-5.8.6.tar.gz 142534 BLAKE2B f701e3fc604c80778989e0a73fef6e66e1292fc3ac6dbc43baefaed6b4806846d6627b50c077924e0fe685f0872df1567140a5b9c0540bdadbb3f789f4830b80 SHA512 4f40fef12215b54d5ec6bb7245508c10c368d2e0316017b930a5f59f4f56fa5a5eb556e8d877b54b0bc70bbaa54f75547e0367fb3206d830b4f8034bd01a3f00
 DIST liquid-5.8.7.tar.gz 143180 BLAKE2B 54bd82de83020a54757993c95843c0176cef7e77409e6c830d6456d0c097b02d1682752301f025b9f2336f6b356a4943a155961ebbd403e57f3ac7953671ab28 SHA512 cf8428dd4c43b29a60edd4295a17af47c1d83c3d481df12095d8222c195c41c6bf7e96725654897fe6fe12113fe43b96a1193a99dc2ed54c6f67c24babcc4117
 DIST liquid-5.9.0.tar.gz 148939 BLAKE2B 167531c20c54e7a39f1c610276ef4b78c7aa9230dc0ecd306e9411b17adfb6250bfb25f2ca8a2c209a7975e0d707788af29352f60ff70763934ce51a199e04f4 SHA512 c0909c50557cac70f4312ef8b9d1642dd166d99ee5f6bf195f6d60afa69ab60bc5b0441c549c605fb5ff2e5bd4aa78aea2840a95f5b43541b2ff640a963328a9
diff --git a/dev-ruby/liquid/liquid-5.10.0.ebuild b/dev-ruby/liquid/liquid-5.10.0.ebuild
new file mode 100644
index 000000000000..a9aba895a60c
--- /dev/null
+++ b/dev-ruby/liquid/liquid-5.10.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby32 ruby33 ruby34"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="History.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="liquid.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Template engine for Ruby"
+HOMEPAGE="https://shopify.github.io/liquid/"
+SRC_URI="https://github.com/Shopify/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm64"
+IUSE="test"
+
+ruby_add_rdepend "
+	dev-ruby/bigdecimal
+	>=dev-ruby/strscan-3.1.1
+"
+
+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
+
+	# Avoid test requiring unpackaged lru_redux
+	sed -e '/require.*lru_redux/ s:^:#:' \
+		-e '/test_expression_cache_with_lru_redux/askip "unpackaged lru_redux"' \
+		-i test/integration/expression_test.rb || die
+
+	# Ensure the gem version of strscan is used.
+	sed -e '3igem "strscan", ">=3.1.1"' \
+		-i test/test_helper.rb || die
+}