gentoo auto-resync : 07:04:2023 - 17:30:27

61 files changed, 1191 insertions, 48 deletions

diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index a746cedfa172..9c55a07e753b 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/actionpack/Manifest b/dev-ruby/actionpack/Manifest
index 34bd067efe7a..ce59fc3ce35f 100644
--- a/dev-ruby/actionpack/Manifest
+++ b/dev-ruby/actionpack/Manifest
@@ -15,6 +15,7 @@ EBUILD actionpack-6.1.7.2.ebuild 2386 BLAKE2B 6a25a96da9b7527153b37014e5b4ffdc47
 EBUILD actionpack-6.1.7.3.ebuild 2386 BLAKE2B 6a25a96da9b7527153b37014e5b4ffdc47d7eb07eb2a028eb1f5581943d000389bdf18dead08518f46610377db2f5b3ce169d6813ba52ed4e2df87d2910ee699 SHA512 49bfd6b5fe4d850eb2f745b31ee9e4ca06b41261cb6e7d9f367032bf5504ea37e4522ad50b9462c09b1b4647a036ab6270876085b1193897a39fc1ab60b4b473
 EBUILD actionpack-6.1.7.ebuild 2313 BLAKE2B b4342277df329108394cc831444ef1e5cf9279a34eefc17df77e97e57e8bbe048cfadce7bfb74ae1a564f2ea43dfcc3e8a4eecc77416ba52fb29ae2215700676 SHA512 0edd62ebeef660d1479d41889505b3b60ad62fa5556d15eed299850306efa4eab1454db427143b8db7f58a1018240e14c4a98b32d185fe619b87625bdae5cfd7
 EBUILD actionpack-7.0.4.2.ebuild 2184 BLAKE2B 852723d17227485f6f342c1b244997e62b176dcc91857ea68f2b3a3c63b5770e2e24de0b3fa08f407547cf3efa97f5791ddbd4d5aa429b0e5dd1c34f20b668be SHA512 120f1c635a451a9f72a7257aebddd21fd1cc0e5895c6576569fe0cd9646685122c8939ee2efa2b91f0f1ddd1e7807b4e2c68b31d5aa2a5eaa12b1073da9e9032
+EBUILD actionpack-7.0.4.3-r1.ebuild 2189 BLAKE2B 1c264485f84886b87a8c339941aeac8929997e43a626a0c56b9b7723f8a5a7fc07bcdd5cf6c23f601b3189777dc05a578977e13d4c33a97fa565025a15674b43 SHA512 6a6ea7371a26cc25a5df876ab9b2d050eea4fd49eb6a7e32266e8a08d0e304bc9d76496f8fcb64fbde9779aee1f7bb151af10ecd7a763323fdb3010c3cb66803
 EBUILD actionpack-7.0.4.3.ebuild 2195 BLAKE2B edac1578c8c3bc57d9add70a1dfbef08cf79ed395f5623b842c3dd05038aa8dafdf83c53903f12ca7e58ecb49aab5cf75275a7da49be470c130561858a9850a6 SHA512 0cadc61f68791b9bca0cb4b6b7422737b7d46e39e129ae385819b4ac9fa266b311fa1b007a80ccc8a7429a52d783f9f9fb53ff161fc0df90b6db37e42f19e1a4
 EBUILD actionpack-7.0.4.ebuild 2037 BLAKE2B b40fa610ca9223bf752a6c157b8293249da0d30089979d091c10eb0d0614bff754b98cd990131db0f19836196d079490f211d4c0a835b423148f00ce90c7841d SHA512 fe5b3db6bd2c24970a3bdfec13bdd1b56e71fdf56216f848a979569c3322054b6f91cfb9fa6993a1e2055390bf1f171c4665910d5faf9b65ed32ae29edacbd9e
 MISC metadata.xml 338 BLAKE2B f32f1ecbd729e4e6162f22cdb9bfe1fbb1284c8b7f021d8207a1a54d2543b0e9866e775d550360dd01ef4f4eb92e96064a8416476c7047853034ea05479eb6e7 SHA512 24fd0d8ea6e3cd5514e5049b7e064b7e3e667ea14978cc7cf620e9c1b020bdc7caf7dbec97ccbf92c2f4c657fff3e9151d6f2af103b3d9c3cc5181cb3a81a295
diff --git a/dev-ruby/actionpack/actionpack-7.0.4.3-r1.ebuild b/dev-ruby/actionpack/actionpack-7.0.4.3-r1.ebuild
new file mode 100644
index 000000000000..1aefaa523fef
--- /dev/null
+++ b/dev-ruby/actionpack/actionpack-7.0.4.3-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="actionpack.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Eases web-request routing, handling, and response"
+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 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/activesupport-${PV}
+	~dev-ruby/actionview-${PV}
+	dev-ruby/rack:2.2
+	>=dev-ruby/rack-test-0.6.3:*
+	>=dev-ruby/rails-html-sanitizer-1.2.0:1
+	dev-ruby/rails-dom-testing:2
+"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/mocha:0.14
+		dev-ruby/bundler
+		>=dev-ruby/capybara-2.15
+		~dev-ruby/activemodel-${PV}
+		~dev-ruby/railties-${PV}
+		>=dev-ruby/rack-cache-1.2:1.2
+		dev-ruby/selenium-webdriver:4
+		www-servers/puma
+		<dev-ruby/minitest-5.16:*
+	)"
+
+all_ruby_prepare() {
+	eapply "${FILESDIR}/actionpack-7.0.4-rack-test-2.patch"
+
+	# 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\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\)/ s:^:#:" \
+		-e '/:job/,/end/ s:^:#:' \
+		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
+	rm ../Gemfile.lock || die
+
+	sed -i -e '1igem "rack", "<3"' test/abstract_unit.rb || die
+
+	# Use different timezone notation, this changed at some point due to an external dependency changing.
+	sed -i -e 's/-0000/GMT/' test/dispatch/response_test.rb test/dispatch/cookies_test.rb test/dispatch/session/cookie_store_test.rb || die
+
+	# Avoid tests that fail with a fixed cgi.rb version
+	sed -i -e '/test_session_store_with_all_domains/askip "Fails with fixed cgi.rb"' test/dispatch/session/cookie_store_test.rb || die
+}
diff --git a/dev-ruby/actionview/Manifest b/dev-ruby/actionview/Manifest
index 95b9fd065f6d..1ad1ce7a5c0d 100644
--- a/dev-ruby/actionview/Manifest
+++ b/dev-ruby/actionview/Manifest
@@ -14,6 +14,7 @@ EBUILD actionview-6.1.7.2.ebuild 2101 BLAKE2B 322b554ad30dd073225865f86526994321
 EBUILD actionview-6.1.7.3.ebuild 2101 BLAKE2B 322b554ad30dd073225865f865269943210f75099dcdc8547b9a20a0709f29a65d6c0c649aed7f2d2cc14e49c64698c712a03631f2e5e3c522c8fe134cb50b4d SHA512 171673dcaeb7053ac06ed62d18a10fae218aeba2d7fe46fbc04bf10b4f6eab89a38bd3d7056c795fc5db5d97227977db5f91505de82f4723e662afb678fe3175
 EBUILD actionview-6.1.7.ebuild 2101 BLAKE2B 322b554ad30dd073225865f865269943210f75099dcdc8547b9a20a0709f29a65d6c0c649aed7f2d2cc14e49c64698c712a03631f2e5e3c522c8fe134cb50b4d SHA512 171673dcaeb7053ac06ed62d18a10fae218aeba2d7fe46fbc04bf10b4f6eab89a38bd3d7056c795fc5db5d97227977db5f91505de82f4723e662afb678fe3175
 EBUILD actionview-7.0.4.2.ebuild 2188 BLAKE2B 7d9bcfe8dd5b3af55028fd5080c8c6c7a11f4f2a3f87efda89ce2938abc7a54432a1bd66f634069aaaf2fb0bc12aaa6921316a0f9850ba974462bb18d3517805 SHA512 08c579404a16eca6ceb76dafdc2851b6d936531869606399e9a1c8f207250797255cf7a672c0bb866654bab967548bcb2c42ba241aecfac943d380d950b9fd4b
+EBUILD actionview-7.0.4.3-r1.ebuild 2193 BLAKE2B 2dff6da15d796ce4fb6ea402953e31a909b1760c7fb418671735c3bf37126b7fb4d7b7885c88a8d5ff456e55ff0a66147408b0a57d902fa8adc3de6bf84101b8 SHA512 5e5c459c9bfa60d8b94713cdc6b658959d60d72bfcc3455a4ed3e665f576f57a852b78b04d5f6b8b57d9ab0ef3ba7a71000e3fb569e2f8a37a9b181f88256105
 EBUILD actionview-7.0.4.3.ebuild 2199 BLAKE2B ac512a7b862df71851ca650d7847c098b1fab23fc24adcae75241fdce77e69f6d2bee96f3f98770fadd2873b6d6d7d18eec90f8fc7f7e66cbc2a37f9962d0b08 SHA512 34baaf61d913b2088cf9a4ff7dfdb627c1054d6e33316d476125ac396604c7db6f0ea88f2caabe274c03f73dae48c16fba03c82b4afdfb93625f8ece65a55d3c
 EBUILD actionview-7.0.4.ebuild 2188 BLAKE2B 7d9bcfe8dd5b3af55028fd5080c8c6c7a11f4f2a3f87efda89ce2938abc7a54432a1bd66f634069aaaf2fb0bc12aaa6921316a0f9850ba974462bb18d3517805 SHA512 08c579404a16eca6ceb76dafdc2851b6d936531869606399e9a1c8f207250797255cf7a672c0bb866654bab967548bcb2c42ba241aecfac943d380d950b9fd4b
 MISC metadata.xml 338 BLAKE2B f32f1ecbd729e4e6162f22cdb9bfe1fbb1284c8b7f021d8207a1a54d2543b0e9866e775d550360dd01ef4f4eb92e96064a8416476c7047853034ea05479eb6e7 SHA512 24fd0d8ea6e3cd5514e5049b7e064b7e3e667ea14978cc7cf620e9c1b020bdc7caf7dbec97ccbf92c2f4c657fff3e9151d6f2af103b3d9c3cc5181cb3a81a295
diff --git a/dev-ruby/actionview/actionview-7.0.4.3-r1.ebuild b/dev-ruby/actionview/actionview-7.0.4.3-r1.ebuild
new file mode 100644
index 000000000000..87decc8e2009
--- /dev/null
+++ b/dev-ruby/actionview/actionview-7.0.4.3-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+RUBY_FAKEGEM_EXTRAINSTALL="app"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Simple, battle-tested conventions and helpers for building web pages"
+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 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/activesupport-${PV}
+	>=dev-ruby/builder-3.1:* =dev-ruby/builder-3*:*
+	>=dev-ruby/erubi-1.4:0
+	>=dev-ruby/rails-html-sanitizer-1.2.0:1
+	dev-ruby/rails-dom-testing:2
+"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/mocha
+		~dev-ruby/actionpack-${PV}
+		~dev-ruby/activemodel-${PV}
+		~dev-ruby/activerecord-${PV}
+		~dev-ruby/railties-${PV}
+		dev-ruby/sqlite3
+		<dev-ruby/minitest-5.16:*
+	)"
+
+all_ruby_prepare() {
+	# 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\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|rack-cache\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|bcrypt\|uglifier\|mime-types\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
+		-e '/:job/,/end/ s:^:#:' \
+		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
+	rm ../Gemfile.lock || die
+
+	# Avoid tests failing due to missing logger setup in activerecord,
+	# most likely related to test environment setup.
+	#rm -f test/activerecord/render_partial_with_record_identification_test.rb || die
+
+	# Fix loading of activerecord integration tests. This avoids loading
+	# activerecord twice and thus redefining constants leading to
+	# failures. Bug #719342
+	sed -e '/abstract_unit/arequire "active_record" ; require "active_record/fixtures"' \
+		-e '/defined/ s/FixtureSet/ActiveRecord::FixtureSet/' \
+		-i test/active_record_unit.rb || die
+}
diff --git a/dev-ruby/activejob/Manifest b/dev-ruby/activejob/Manifest
index ebf1520df608..5657149ca0ac 100644
--- a/dev-ruby/activejob/Manifest
+++ b/dev-ruby/activejob/Manifest
@@ -14,6 +14,7 @@ EBUILD activejob-6.1.7.2.ebuild 1155 BLAKE2B adbcff19fbd8d42b161a3f88a929864d2cb
 EBUILD activejob-6.1.7.3.ebuild 1155 BLAKE2B adbcff19fbd8d42b161a3f88a929864d2cbcc0ef8fb177ddf0d4829b9ad71a346f1235268ebae1ad43fe30d7c0be4bdc28fc0aaa2d6a3c305307c381bcf53ed2 SHA512 c584d3d48a7b2626d71ac0e6973dfc4584adc3e5b4981f4006c8dd193b56fb85980e9ae6a487f3a837debe6c6974b4ecd6450e17c1c7e663d54ed6f312f5a177
 EBUILD activejob-6.1.7.ebuild 1155 BLAKE2B af67f312316340e9014714f0834af45a093c2a205cd4d9d44affdb0330f25e4776c52a967847af7a1dff1b9cc189ffa1555a3cbaf7c296380dbebc8972fc9986 SHA512 147dc2ef63d7c79d1424186feae541b6d340ae3d26c4fc82729c58d646c9e723802b0cb3558cdcd079dc1d55bdbfbcda4ead04e85ca848b26722760a5a70f91a
 EBUILD activejob-7.0.4.2.ebuild 1204 BLAKE2B e5d60c3a017196275010b20d08d3b4de66303e32f0a50c3e221f017135420c829d7a040ac3e323d5212f927ddb51362aa767fc96dd987c8b9da8ce10cfc35277 SHA512 064f310d7fabd0f0c579610d5130969962394b46f5376f295bce5b520eec0bda19c460e4f41fdbf0314b9bd32b29702b009da6ecc5e9c8a99b65c2cd139c7f1e
+EBUILD activejob-7.0.4.3-r1.ebuild 1203 BLAKE2B e306f513eb531e5f95d3be323d8d0867f7781a2f29d0b36dbf616c13b47972bf28b595d18e9fd1d8208bfd500fdc4089995408cc0bf5860450c7eee68c692e24 SHA512 4318e4d0244f895ff39ab9ae1f41069d4ec1dcafcec65831618dc132983b6d2f83454d80f82956b21d5f9df4c6491ee6ca9ca8cab95978647a7ad8196968b2b1
 EBUILD activejob-7.0.4.3.ebuild 1209 BLAKE2B 764e15f77348566322d6877b1dc57703368494a9433827d96b73c0fffe7da897fe6fba76678eaa08ecf7bdc3886f9949b49b37993760aba98602c736b2eb530a SHA512 661012ce76b5caeabad6c12c959ab19493ac948ffd168adf9ac11df0a9aeb64096a8dbc66b59521dde1ff341dfb08fe4cf732b3f70723cc5ffbc48c5d274c76e
 EBUILD activejob-7.0.4.ebuild 1204 BLAKE2B e5d60c3a017196275010b20d08d3b4de66303e32f0a50c3e221f017135420c829d7a040ac3e323d5212f927ddb51362aa767fc96dd987c8b9da8ce10cfc35277 SHA512 064f310d7fabd0f0c579610d5130969962394b46f5376f295bce5b520eec0bda19c460e4f41fdbf0314b9bd32b29702b009da6ecc5e9c8a99b65c2cd139c7f1e
 MISC metadata.xml 338 BLAKE2B f32f1ecbd729e4e6162f22cdb9bfe1fbb1284c8b7f021d8207a1a54d2543b0e9866e775d550360dd01ef4f4eb92e96064a8416476c7047853034ea05479eb6e7 SHA512 24fd0d8ea6e3cd5514e5049b7e064b7e3e667ea14978cc7cf620e9c1b020bdc7caf7dbec97ccbf92c2f4c657fff3e9151d6f2af103b3d9c3cc5181cb3a81a295
diff --git a/dev-ruby/activejob/activejob-7.0.4.3-r1.ebuild b/dev-ruby/activejob/activejob-7.0.4.3-r1.ebuild
new file mode 100644
index 000000000000..749ad1c8eb29
--- /dev/null
+++ b/dev-ruby/activejob/activejob-7.0.4.3-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_RECIPE_DOC=""
+RUBY_FAKEGEM_DOCDIR=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Job framework with pluggable queues"
+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 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/activesupport-${PV}
+	>=dev-ruby/globalid-0.3.6
+"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/mocha
+	)"
+
+all_ruby_prepare() {
+	# Set test environment to our hand.
+	sed -i -e '/load_paths/d' test/helper.rb || die "Unable to remove load paths"
+
+	# Remove all currently unpackaged queues.
+	sed -i -e 's/que queue_classic resque sidekiq sneakers sucker_punch backburner//' \
+		-e 's/delayed_job//' Rakefile || die
+	sed -i -e '/SneakersAdapter/ s:^:#:' test/cases/exceptions_test.rb || die
+	rm -f test/cases/delayed_job_adapter_test.rb || die
+}
diff --git a/dev-ruby/activemodel/Manifest b/dev-ruby/activemodel/Manifest
index 90084b6feb5d..2cb1aa8575c5 100644
--- a/dev-ruby/activemodel/Manifest
+++ b/dev-ruby/activemodel/Manifest
@@ -14,6 +14,7 @@ EBUILD activemodel-6.1.7.2.ebuild 1005 BLAKE2B 50f0c80c62e14af5eecabcfbefdc539d5
 EBUILD activemodel-6.1.7.3.ebuild 1005 BLAKE2B 50f0c80c62e14af5eecabcfbefdc539d55a9988df8f34bbf582e4bf704f8a06e50f6df6fc7b55a2298b581248146da814e41868181d8d9ced5890e97a3ed2554 SHA512 f9c31189226b0f5a92dc180af339a9b480eb2d2244ea2f33398858b35cb0566ee344de2733b4ca00dad740f01291682afdfa513f89f9e1ed7060900e215ace16
 EBUILD activemodel-6.1.7.ebuild 1005 BLAKE2B 50f0c80c62e14af5eecabcfbefdc539d55a9988df8f34bbf582e4bf704f8a06e50f6df6fc7b55a2298b581248146da814e41868181d8d9ced5890e97a3ed2554 SHA512 f9c31189226b0f5a92dc180af339a9b480eb2d2244ea2f33398858b35cb0566ee344de2733b4ca00dad740f01291682afdfa513f89f9e1ed7060900e215ace16
 EBUILD activemodel-7.0.4.2.ebuild 1000 BLAKE2B 2ea929fc062df458b1d93b8724e1f2984ecef0e7656c00e560a65dfd5e1883c9dc043f90d676c4a5b97c8213a1efe305311704366930e97c4bc2b03f6240364b SHA512 61c35a011b47a345095119a9494c3f1b4c2f7eaeef6246bd41279637b3e1820abe86e971669dcd6832de2a4844e1e168ce42ef66011218e95261411f04fad469
+EBUILD activemodel-7.0.4.3-r1.ebuild 999 BLAKE2B 94d38f084e0fd7235b52227fbe2c16be8bfcde610cd654acc7d2d7d8724160389acfa6c29a748a55e2efa7b5db67b4d467acb83afdbf833a3af3cebf22f7143d SHA512 72426f91ac11a66ebff55542e0cfa27fa3ff58dc437f5c54216c93a741d0034cee325d6df591c1d562b8d20eda7b832d6f3cedfccf736c26e47e1918cb3062c0
 EBUILD activemodel-7.0.4.3.ebuild 1005 BLAKE2B 50f0c80c62e14af5eecabcfbefdc539d55a9988df8f34bbf582e4bf704f8a06e50f6df6fc7b55a2298b581248146da814e41868181d8d9ced5890e97a3ed2554 SHA512 f9c31189226b0f5a92dc180af339a9b480eb2d2244ea2f33398858b35cb0566ee344de2733b4ca00dad740f01291682afdfa513f89f9e1ed7060900e215ace16
 EBUILD activemodel-7.0.4.ebuild 1000 BLAKE2B 2ea929fc062df458b1d93b8724e1f2984ecef0e7656c00e560a65dfd5e1883c9dc043f90d676c4a5b97c8213a1efe305311704366930e97c4bc2b03f6240364b SHA512 61c35a011b47a345095119a9494c3f1b4c2f7eaeef6246bd41279637b3e1820abe86e971669dcd6832de2a4844e1e168ce42ef66011218e95261411f04fad469
 MISC metadata.xml 338 BLAKE2B f32f1ecbd729e4e6162f22cdb9bfe1fbb1284c8b7f021d8207a1a54d2543b0e9866e775d550360dd01ef4f4eb92e96064a8416476c7047853034ea05479eb6e7 SHA512 24fd0d8ea6e3cd5514e5049b7e064b7e3e667ea14978cc7cf620e9c1b020bdc7caf7dbec97ccbf92c2f4c657fff3e9151d6f2af103b3d9c3cc5181cb3a81a295
diff --git a/dev-ruby/activemodel/activemodel-7.0.4.3-r1.ebuild b/dev-ruby/activemodel/activemodel-7.0.4.3-r1.ebuild
new file mode 100644
index 000000000000..62707fb49444
--- /dev/null
+++ b/dev-ruby/activemodel/activemodel-7.0.4.3-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="activemodel.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Toolkit for building modeling frameworks like Active Record and Active Resource"
+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 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "
+	~dev-ruby/activesupport-${PV}:*
+"
+
+ruby_add_bdepend "
+	test? (
+		~dev-ruby/railties-${PV}
+		dev-ruby/test-unit:2
+		dev-ruby/mocha
+		>=dev-ruby/bcrypt-ruby-3.1.7
+		<dev-ruby/minitest-5.16:*
+	)"
+
+all_ruby_prepare() {
+	# Set test environment to our hand.
+	sed -i -e '/load_paths/d' test/cases/helper.rb || die "Unable to remove load paths"
+}
diff --git a/dev-ruby/activerecord/Manifest b/dev-ruby/activerecord/Manifest
index 8f3678e78d7f..f6698d86a038 100644
--- a/dev-ruby/activerecord/Manifest
+++ b/dev-ruby/activerecord/Manifest
@@ -14,6 +14,7 @@ EBUILD activerecord-6.1.7.2.ebuild 3409 BLAKE2B 41e5777a93ba98809f6a2c4fa616e926
 EBUILD activerecord-6.1.7.3.ebuild 3409 BLAKE2B 41e5777a93ba98809f6a2c4fa616e926354ba4ac374170351135d3e2616476dae800e913a95401b9a8a9c1c1a6f7b4d35c0408686c66669e0a38dec349a9f153 SHA512 7901fddf303bcd9f81fa13dc5c496771180ebf00608e12274bda9df88dd69cbc1c2386d01c36c349629b76cefae96de05f145d6ee0cf90773d503fff091b1ca5
 EBUILD activerecord-6.1.7.ebuild 3409 BLAKE2B 41e5777a93ba98809f6a2c4fa616e926354ba4ac374170351135d3e2616476dae800e913a95401b9a8a9c1c1a6f7b4d35c0408686c66669e0a38dec349a9f153 SHA512 7901fddf303bcd9f81fa13dc5c496771180ebf00608e12274bda9df88dd69cbc1c2386d01c36c349629b76cefae96de05f145d6ee0cf90773d503fff091b1ca5
 EBUILD activerecord-7.0.4.2.ebuild 3065 BLAKE2B 3b332b6a106927d7baf9b73bf84c827c14b9f47cdef7ac8157e02f4dcdee830fa28f851bc03a9a208db76e893e2f2887ea01f457d2c5e272d69cd37ebc24863b SHA512 ff8580dd8a552fc83956f0925f40e112beec3b0ce7cced12c0cf432cbecc1e5f6efd8b2e9a207735805daf718f5d39b8b5354176510910686b96a6a5bedd5a0d
+EBUILD activerecord-7.0.4.3-r1.ebuild 3070 BLAKE2B 48d8ba2037fb0248d42591cb98895bd2bfdd484d71a233f4a1d64bda803bae16d35c4c5915d629c2818b038f5dd3f38ce89a02f0f054de9315bc97c1c6d0bc12 SHA512 188a8a718217dc267034a1f06a33ef1b1d1cc95728ece240c9db313fc480050d36183b5d4b4ff2c7ff8271124d1b3b54c014f1a29fa4647cfbcf1d5f01f2c58c
 EBUILD activerecord-7.0.4.3.ebuild 3076 BLAKE2B 107974c867aeff3add8564eceb98b01d85df1d5e954f2626142e57c3d0e86e4e4d8a0744b3136226135a571d60846c500b3d2ac9a86561b7cf6c6370c08e5810 SHA512 4e07333188323f9894d689b4dcd1315af12cb18090453f9491eaf0c7f2636bc68f85e6a7c05f7d3085144903461420aa4dac68da2b295403f8918d77010aeb17
 EBUILD activerecord-7.0.4.ebuild 3004 BLAKE2B fdb45478d51ff7847f54f12102fcbf1b5527ba26cef08e6ffb50c4b597f998190d2adf34b618c0df06b54f1586edc6605928b0cb530dcd1116cee6634d979d78 SHA512 8c65177f9f188bf89c956c0eec7bacafdc8b13bcc4ed5e8cbfc6e8c9372d32b9b43f5d2eadb32ef21695b2f2f2be4e23c11babf7f9f5533a7f944feab1911541
 MISC metadata.xml 338 BLAKE2B f32f1ecbd729e4e6162f22cdb9bfe1fbb1284c8b7f021d8207a1a54d2543b0e9866e775d550360dd01ef4f4eb92e96064a8416476c7047853034ea05479eb6e7 SHA512 24fd0d8ea6e3cd5514e5049b7e064b7e3e667ea14978cc7cf620e9c1b020bdc7caf7dbec97ccbf92c2f4c657fff3e9151d6f2af103b3d9c3cc5181cb3a81a295
diff --git a/dev-ruby/activerecord/activerecord-7.0.4.3-r1.ebuild b/dev-ruby/activerecord/activerecord-7.0.4.3-r1.ebuild
new file mode 100644
index 000000000000..5da1dc7308e9
--- /dev/null
+++ b/dev-ruby/activerecord/activerecord-7.0.4.3-r1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
+
+# this is not null so that the dependencies will actually be filled
+RUBY_FAKEGEM_TASK_TEST="test"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="activerecord.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM"
+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 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="mysql postgres sqlite"
+
+RUBY_S="rails-${PV}/${PN}"
+
+ruby_add_rdepend "~dev-ruby/activesupport-${PV}
+	~dev-ruby/activemodel-${PV}
+	sqlite? ( >=dev-ruby/sqlite3-1.4 )
+	mysql? ( dev-ruby/mysql2:0.5 )
+	postgres? ( >=dev-ruby/pg-1.1:1 )"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/benchmark-ips
+		dev-ruby/bundler
+		~dev-ruby/actionpack-${PV}
+		~dev-ruby/railties-${PV}
+		>=dev-ruby/sqlite3-1.4.0
+		dev-ruby/mocha
+		<dev-ruby/minitest-5.16:*
+	)"
+
+DEPEND+=" test? ( >=dev-db/sqlite-3.12.1 )"
+
+all_ruby_prepare() {
+	# Remove items from the common Gemfile that we don't need for this
+	# test run. This also requires handling some gemspecs.
+	rm ../Gemfile.lock || die
+	sed -i -e "/\(uglifier\|system_timer\|sdoc\|w3c_validators\|pg\|jquery-rails\|execjs\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
+		-e '/:job/,/end/ s:^:#:' \
+		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
+	sed -i -e '/rack-ssl/d' -e 's/~> 3.4/>= 3.4/' ../railties/railties.gemspec || die
+	sed -e '/bcrypt/ s/3.0.0/3.0/' \
+		-i ../Gemfile || die
+	sed -i -e '/byebug/ s:^:#:' test/cases/base_prevent_writes_test.rb || die
+
+	# Add back json in the Gemfile because we dropped some dependencies
+	# earlier that implicitly required it.
+	sed -i -e '$agem "json"' ../Gemfile || die
+
+	sed -i -e '1igem "rack", "<3"' test/cases/helper.rb || die
+
+	# Avoid single tests using mysql or postgres dependencies.
+	rm test/cases/invalid_connection_test.rb || die
+	sed -e '/test_switching_connections_with_database_url/askip "postgres"' \
+		-i test/cases/connection_adapters/{,legacy_}connection_handlers_multi_db_test.rb || die
+
+	# Avoid failing test that makes bad assumptions on database state.
+	sed -i -e '/test_do_not_call_callbacks_for_delete_all/,/^  end/ s:^:#:' \
+		test/cases/associations/has_many_associations_test.rb
+
+	# Avoid test failing to bind limit length in favor of security release
+	sed -i -e '/test_too_many_binds/askip "Fails on Gentoo"' test/cases/bind_parameter_test.rb || die
+
+	# Avoid test failing related to rubygems
+	sed -i -e '/test_generates_absolute_path_with_given_root/askip "rubygems actiovation monitor"' test/cases/tasks/sqlite_rake_test.rb || die
+}
+
+each_ruby_test() {
+	if use sqlite; then
+		${RUBY} -S rake test_sqlite3 || die "sqlite3 tests failed"
+	fi
+}
diff --git a/dev-ruby/activestorage/Manifest b/dev-ruby/activestorage/Manifest
index 4fc18a9b3d49..cb1d92a96f0d 100644
--- a/dev-ruby/activestorage/Manifest
+++ b/dev-ruby/activestorage/Manifest
@@ -14,6 +14,7 @@ EBUILD activestorage-6.1.7.2.ebuild 2047 BLAKE2B 793523981ee5659b5b0e041147e6008
 EBUILD activestorage-6.1.7.3.ebuild 2065 BLAKE2B 8a23cea3698294697d3f9e74eb3be550a10fae6b25a9ee3012e02530bdfe6e71d839bb26cff378180af29c05b8e44ace491d4fff91d7be28c622dc38e76dfd69 SHA512 4af82610ab497812d869a07cb6b251b5f6a1d52ff67d4f61827fca866633d305a35e35dd7df4d3cd8f288004a5c11003d190ed9987f37cd6f81cf66abd19776a
 EBUILD activestorage-6.1.7.ebuild 2047 BLAKE2B 0fe7eefccbc225ce2154e4a7bd0e3e289daaf1866d31368be4a588ac80335fd8825e73e4870e7f7912f7907d676a5dde7249105862218b4abf2096fb3ab8ae4b SHA512 62265bc9a3b47828b68ac16da3261dea8739b8d9cb28d2cdabea2b6c6c7eb1442a35cffaf655fbc6851c65aa9690f31fb125f1dcc34909dd8109dac8ed23621f
 EBUILD activestorage-7.0.4.2.ebuild 2512 BLAKE2B b0f7bada22e3a3ca5716998dc2b5c4a6bc5defbc97fbbe0a6412e3a8255a712b47f1101a39614164705a0b1ad2fcad6aba15a0245bf6bfe6fe85736ea18019c5 SHA512 d38f5d45716895161036da0957b6a5bb60e6f7dbbd89a0cf1846dd49f83d6e5b041be91c169c0a647de49a5e1e800efc55173882bf062a5647adaf737480d4b7
+EBUILD activestorage-7.0.4.3-r1.ebuild 2530 BLAKE2B 73a436d25d56270098b12395ffda8b974a639876c573ab453759df41259bd4ba87a1186d91b1b941da2806470b18ed8172c89e8976f4ac0f1e5cfc393909b3e9 SHA512 6dd3e8c723db3832d384a4a251fd2aa4a15867d91e0874b6920b790568e07298cfb5a95ca1df2b6b0e74b92a79a949b8c37b766a00b36a81607294957992c081
 EBUILD activestorage-7.0.4.3.ebuild 2530 BLAKE2B 54dac637a5305589f1daba5991ec3bbc16b276fc51342cdfe176520e93dffaccaca9196e93aaa4292d38886834a11e67e20239dc65a62b6a248445233790ed29 SHA512 9bcc03b7fce491a36bf29cd01549df75eb75414d7a6a9c12590ca022e3dcb41e8a0253fac87705efe55056404427633c5fe57df8dc86f6250b7b80fd336a7621
 EBUILD activestorage-7.0.4.ebuild 2487 BLAKE2B 43c3b04bbda4b86074ac53ed6006cf73f266fb549afa966d869a8d2323b9e739d1b59f0584e11a616935b4098398eedd18796cd5975f331a4ad27e49c8bd6e18 SHA512 a6f2dee6f7e7eaf97ebf9a78632a0d3ed13bb80b23ccebd7c6f0071eb6826526d918ca91095c12073f360c5951ffcd007c3d7e37fb3ed5f02b6ef323354a2b2e
 MISC metadata.xml 338 BLAKE2B f32f1ecbd729e4e6162f22cdb9bfe1fbb1284c8b7f021d8207a1a54d2543b0e9866e775d550360dd01ef4f4eb92e96064a8416476c7047853034ea05479eb6e7 SHA512 24fd0d8ea6e3cd5514e5049b7e064b7e3e667ea14978cc7cf620e9c1b020bdc7caf7dbec97ccbf92c2f4c657fff3e9151d6f2af103b3d9c3cc5181cb3a81a295
diff --git a/dev-ruby/activestorage/activestorage-7.0.4.3-r1.ebuild b/dev-ruby/activestorage/activestorage-7.0.4.3-r1.ebuild
new file mode 100644
index 000000000000..4e7b11fdc400
--- /dev/null
+++ b/dev-ruby/activestorage/activestorage-7.0.4.3-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_RECIPE_DOC=""
+RUBY_FAKEGEM_DOCDIR=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="activestorage.gemspec"
+
+RUBY_FAKEGEM_EXTRAINSTALL="app config db"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Attach cloud and local files in Rails applications"
+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 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+DEPEND+=" test? ( app-text/mupdf media-gfx/imagemagick[jpeg,png,tiff] media-video/ffmpeg app-text/poppler[utils] ) "
+
+ruby_add_rdepend "
+	~dev-ruby/actionpack-${PV}:*
+	~dev-ruby/activejob-${PV}:*
+	~dev-ruby/activerecord-${PV}:*
+	~dev-ruby/activesupport-${PV}:*
+	dev-ruby/marcel:1.0
+	>=dev-ruby/mini_mime-1.1.0
+"
+
+ruby_add_bdepend "
+	test? (
+		~dev-ruby/railties-${PV}
+		>=dev-ruby/image_processing-1.2:0
+		=dev-ruby/minitest-5.15*:*
+		dev-ruby/mini_magick
+		dev-ruby/mocha
+		dev-ruby/rake
+		dev-ruby/sprockets-rails
+		dev-ruby/sqlite3
+	)"
+
+all_ruby_prepare() {
+		# Remove items from the common Gemfile that we don't need for this
+		# test run. This also requires handling some gemspecs.
+		sed -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|bcrypt\|uglifier\|aws-sdk-s3\|aws-sdk-sns\|google-cloud-storage\|azure-storage\|blade\|bootsnap\|hiredis\|qunit-selenium\|chromedriver-helper\|redis\|rb-inotify\|stackprof\|websocket-client-simple\|libxml-ruby\|sass-rails\|capybara\|rack-cache\|selenium\|dalli\|listen\|connection_pool\|puma\|mysql2\|webdrivers\|webpacker\|rexml\|webmock\|propshaft\|sprockets-export\|rack-test\|terser\)/ s:^:#:" \
+			-e '/stimulus-rails/,/tailwindcss-rails/ s:^:#:' \
+			-e '/group :\(doc\|job\|rubocop\|test\)/,/^end/ s:^:#:' \
+			-i ../Gemfile || die
+		rm ../Gemfile.lock || die
+
+		# Use mini_magick since vips is not packaged on Gentoo
+		sed -i -e '/mini_magick/aActiveStorage.variant_processor = :mini_magick' test/test_helper.rb || die
+		# Avoid vips-specific tests
+		sed -i -e '/\(resized and monochrome variation of JPEG blob\|monochrome with default variant_processor\|disabled variation of JPEG blob\)/askip "No vips support"' test/models/variant_test.rb || die
+}
diff --git a/dev-ruby/asciidoctor/Manifest b/dev-ruby/asciidoctor/Manifest
index 7a47eb4a9b82..fae63703fe1d 100644
--- a/dev-ruby/asciidoctor/Manifest
+++ b/dev-ruby/asciidoctor/Manifest
@@ -1,3 +1,6 @@
+AUX asciidoctor-2.0.18-haml-6.patch 5997 BLAKE2B 897adee2b951d91945ed3317b3f5ae1fe70e371533ac368712463755807fa7adef9eea753c20fe84ff97bf72a7bed655d74996c264670c7ba24ae199d83208cf SHA512 df4657a3a0adffb942e2c4ff549561ef7dc008eabf037fb80a805c54fb44c3286df1fc757d98e8d5c14831343a4c612f12da93add9d1a9172fc5c8e98dd4c92c
+AUX asciidoctor-2.0.18-ruby32.patch 1430 BLAKE2B 6b8ed5fcfd662c393d5693c10e9ed07ec53f629378c71a2a7d8a5e579ce76b44766dc73a9088e6dd08f7ba36aa94049f9e7ca93ce6c07dd94894141cf5fcdab3 SHA512 6cfb491aa13acff128a48ddddab5b6f0e8ff337509a8efde5a7c331859cded7fccb02fb043929442f817f70ad47d589a433f01480f6b6440b47bdea4c13b2ada
 DIST asciidoctor-2.0.18.tar.gz 1690964 BLAKE2B 5e14371c7201f83529fa28a63b031599ebf53fda62b4701942f134e7f1dae923a07676aafeac4c5e1fc3c25b6e9044b34b9b2e5b07491f1ca8e68076aa02301b SHA512 b47b377520046d95101fc9bcd3defdf7219714ebadc0d069cb108d39a349fcf1abd1e61178e1515f75bb69e9e3d0f8cb2de67de5a0f8aa75fdd139d693c0e437
+EBUILD asciidoctor-2.0.18-r1.ebuild 1300 BLAKE2B 3649660aa49c6e8f3bb7f7e1282e1dd6dd70b8e8a37eea824cb87235dfdc89a6a304e29f26f17138c79bf23912f407fd001f030b52c7a2ad9ac1e69a581d5006 SHA512 4e30c1f74a1ad7a785d445dab28231e757dcb3e112f3d60faab54ce0f2816f9ddc2946af6de1f4fb981eae14adbd171ae16743aedaf38ff209881c926f52a1a3
 EBUILD asciidoctor-2.0.18.ebuild 1197 BLAKE2B c437f1b0f511902587d6b2a63ee4d70c0346589e68cb6f4fa4fbb1bc2cdfe5cd76059dcdec0e4546cd2e9032c9da97b529814642d239cc121b283c406550e27d SHA512 44238308ea5c18018d5909a6cd83def48d4a710e553373dd4b6f6b4f5ae229a10eb9888e4ccfb975393db718553b030808031149b8f5aa3f3857b45f7d53325b
 MISC metadata.xml 350 BLAKE2B c70c7bdd08d3c12de9192349bb765e3f0a03e5124128b77d4e4cbd266ddc84d72aa4502751bbaaef2562c4d8b78a4ecc28bdf656ecb56c74168999c92dd294b1 SHA512 beaf7f42c6804df34ce8d1ec28e08bdb5dff9ed9ed023247a464e7531ab8fcc41563133cc2bdb6385d5527a78f5e4a6f11063b72c567a015b8517ea09cf5ca17
diff --git a/dev-ruby/asciidoctor/asciidoctor-2.0.18-r1.ebuild b/dev-ruby/asciidoctor/asciidoctor-2.0.18-r1.ebuild
new file mode 100644
index 000000000000..2ed8b6ee1b63
--- /dev/null
+++ b/dev-ruby/asciidoctor/asciidoctor-2.0.18-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_TASK_TEST="CUCUMBER_PUBLISH_QUIET=true test features"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.adoc README.adoc"
+
+RUBY_FAKEGEM_EXTRAINSTALL="data"
+
+RUBY_FAKEGEM_GEMSPEC="asciidoctor.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Processor for converting AsciiDoc into HTML 5, DocBook 4.5 and other formats"
+HOMEPAGE="https://github.com/asciidoctor/asciidoctor"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE=""
+
+ruby_add_bdepend "test? (
+	dev-util/cucumber
+	dev-ruby/rspec-expectations:*
+	dev-ruby/asciimath
+	dev-ruby/coderay
+	dev-ruby/concurrent-ruby
+	dev-ruby/erubi
+	dev-ruby/haml:6
+	dev-ruby/nokogiri
+	dev-ruby/rouge
+	dev-ruby/slim
+	dev-ruby/tilt )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.0.18-haml-6.patch
+	"${FILESDIR}"/${PN}-2.0.18-ruby32.patch
+)
+
+all_ruby_prepare() {
+	rm Gemfile || die
+
+	sed -i -e "s:_relative ': './:" ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid broken blocks_test.rb (already appears to be fixed upstream)
+	rm -f test/blocks_test.rb || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	doman man/asciidoctor.1
+}
diff --git a/dev-ruby/asciidoctor/files/asciidoctor-2.0.18-haml-6.patch b/dev-ruby/asciidoctor/files/asciidoctor-2.0.18-haml-6.patch
new file mode 100644
index 000000000000..b6896999f838
--- /dev/null
+++ b/dev-ruby/asciidoctor/files/asciidoctor-2.0.18-haml-6.patch
@@ -0,0 +1,130 @@
+https://sources.debian.org/patches/asciidoctor/2.0.18-2/0001-Port-tests-to-haml-6.patch/ (backport)
+https://github.com/asciidoctor/asciidoctor/pull/4395
+
+From 25ee484dd66cc813eaa421d1c104ae64478e51ff Mon Sep 17 00:00:00 2001
+From: Antonio Terceiro <terceiro@debian.org>
+Date: Mon, 26 Dec 2022 13:11:36 -0300
+Subject: [PATCH] Port tests to haml 6
+
+Forwarded: https://github.com/asciidoctor/asciidoctor/pull/4395
+Fixes: #4382
+--- a/asciidoctor.gemspec
++++ b/asciidoctor.gemspec
+@@ -38,7 +38,7 @@ Gem::Specification.new do |s|
+   s.add_development_dependency 'cucumber', '~> 3.1.0'
+   # erubi is needed for testing alternate eRuby impls
+   s.add_development_dependency 'erubi', '~> 1.10.0'
+-  s.add_development_dependency 'haml', '~> 5.2.0'
++  s.add_development_dependency 'haml', '~> 6.1'
+   s.add_development_dependency 'minitest', '~> 5.14.0'
+   s.add_development_dependency 'nokogiri', '~> 1.10.0'
+   s.add_development_dependency 'rake', '~> 12.3.0'
+--- a/lib/asciidoctor/converter/template.rb
++++ b/lib/asciidoctor/converter/template.rb
+@@ -29,7 +29,7 @@ class Converter::TemplateConverter < Con
+     erb: { trim: 0 },
+     # TODO line 466 of haml/compiler.rb sorts the attributes; file an issue to make this configurable
+     # NOTE AsciiDoc syntax expects HTML/XML output to use double quotes around attribute values
+-    haml: { format: :xhtml, attr_wrapper: '"', escape_attrs: false, ugly: true },
++    haml: { format: :xhtml, attr_quote: '"', escape_attrs: false, ugly: true },
+     slim: { disable_escape: true, sort_attrs: false, pretty: false },
+   }
+ 
+--- a/test/converter_test.rb
++++ b/test/converter_test.rb
+@@ -9,7 +9,7 @@ context 'Converter' do
+       assert_kind_of Asciidoctor::Converter::CompositeConverter, doc.converter
+       selected = doc.converter.find_converter('paragraph')
+       assert_kind_of Asciidoctor::Converter::TemplateConverter, selected
+-      assert_kind_of Tilt::HamlTemplate, selected.templates['paragraph']
++      assert_kind_of Haml::Template, selected.templates['paragraph']
+       assert_equal :html5, selected.templates['paragraph'].options[:format]
+     end
+ 
+@@ -18,7 +18,7 @@ context 'Converter' do
+       assert_kind_of Asciidoctor::Converter::CompositeConverter, doc.converter
+       selected = doc.converter.find_converter('paragraph')
+       assert_kind_of Asciidoctor::Converter::TemplateConverter, selected
+-      assert_kind_of Tilt::HamlTemplate, selected.templates['paragraph']
++      assert_kind_of Haml::Template, selected.templates['paragraph']
+       assert_equal :xhtml, selected.templates['paragraph'].options[:format]
+     end
+ 
+@@ -95,7 +95,7 @@ context 'Converter' do
+       %w(paragraph sidebar).each do |node_name|
+         selected = doc.converter.find_converter node_name
+         assert_kind_of Asciidoctor::Converter::TemplateConverter, selected
+-        assert_kind_of Tilt::HamlTemplate, selected.templates[node_name]
++        assert_kind_of Haml::Template, selected.templates[node_name]
+         assert_equal %(block_#{node_name}.html.haml), File.basename(selected.templates[node_name].file)
+       end
+     end
+@@ -126,7 +126,7 @@ context 'Converter' do
+       %w(paragraph).each do |node_name|
+         selected = doc.converter.find_converter node_name
+         assert_kind_of Asciidoctor::Converter::TemplateConverter, selected
+-        assert_kind_of Tilt::HamlTemplate, selected.templates[node_name]
++        assert_kind_of Haml::Template, selected.templates[node_name]
+         assert_equal %(block_#{node_name}.xml.haml), File.basename(selected.templates[node_name].file)
+       end
+     end
+@@ -215,7 +215,7 @@ context 'Converter' do
+       refute_empty caches[:templates]
+       paragraph_template = caches[:templates].values.find {|t| File.basename(t.file) == 'block_paragraph.html.haml' }
+       refute_nil paragraph_template
+-      assert_kind_of ::Tilt::HamlTemplate, paragraph_template
++      assert_kind_of Haml::Template, paragraph_template
+     end
+ 
+     test 'should be able to disable template cache' do
+--- a/test/fixtures/custom-backends/haml/docbook5/block_paragraph.xml.haml
++++ b/test/fixtures/custom-backends/haml/docbook5/block_paragraph.xml.haml
+@@ -1,6 +1,6 @@
+ - if title?
+   %formalpara{'xml:id'=>@id, role: (attr :role), xreflabel: (attr :reftext)}
+-    %title=title
+-    %para=content
++    %title!=title
++    %para!=content
+ - else
+-  %para{'xml:id'=>@id, role: (attr :role), xreflabel: (attr :reftext)}=content
++  %para{'xml:id'=>@id, role: (attr :role), xreflabel: (attr :reftext)}!=content
+--- a/test/fixtures/custom-backends/haml/html5-tweaks/block_paragraph.html.haml
++++ b/test/fixtures/custom-backends/haml/html5-tweaks/block_paragraph.html.haml
+@@ -1 +1 @@
+-%p=content
++%p!=content
+--- a/test/fixtures/custom-backends/haml/html5-tweaks/embedded.html.haml
++++ b/test/fixtures/custom-backends/haml/html5-tweaks/embedded.html.haml
+@@ -1 +1 @@
+-=content
++!=content
+--- a/test/fixtures/custom-backends/haml/html5/block_paragraph.html.haml
++++ b/test/fixtures/custom-backends/haml/html5/block_paragraph.html.haml
+@@ -1,3 +1,3 @@
+ - if title?
+-  .title=title
+-%p{id: @id, class: (attr 'role')}=content
++  .title!=title
++%p{id: @id, class: (attr 'role')}!=content
+--- a/test/fixtures/custom-backends/haml/html5/block_sidebar.html.haml
++++ b/test/fixtures/custom-backends/haml/html5/block_sidebar.html.haml
+@@ -1,5 +1,5 @@
+ %aside{id: @id, class: (attr 'role')}
+   - if title?
+     %header
+-      %h1=title
+-  =content.chomp
++      %h1!=title
++  !=content.chomp
+--- a/test/invoker_test.rb
++++ b/test/invoker_test.rb
+@@ -616,7 +616,7 @@ context 'Invoker' do
+     assert_kind_of Asciidoctor::Converter::CompositeConverter, doc.converter
+     selected = doc.converter.find_converter 'paragraph'
+     assert_kind_of Asciidoctor::Converter::TemplateConverter, selected
+-    assert_kind_of Tilt::HamlTemplate, selected.templates['paragraph']
++    assert_kind_of Haml::Template, selected.templates['paragraph']
+   end
+ 
+   test 'should load custom templates from multiple template directories' do
diff --git a/dev-ruby/asciidoctor/files/asciidoctor-2.0.18-ruby32.patch b/dev-ruby/asciidoctor/files/asciidoctor-2.0.18-ruby32.patch
new file mode 100644
index 000000000000..86e577c796ec
--- /dev/null
+++ b/dev-ruby/asciidoctor/files/asciidoctor-2.0.18-ruby32.patch
@@ -0,0 +1,29 @@
+https://github.com/asciidoctor/asciidoctor/commit/b3c05398b1b4b483fe5f9c9ef89dc772863cf6f1
+https://src.fedoraproject.org/rpms/rubygem-asciidoctor/raw/rawhide/f/0001-resolves-4390-fix-call-order-so-use-of-an-include-fi.patch
+
+From b3c05398b1b4b483fe5f9c9ef89dc772863cf6f1 Mon Sep 17 00:00:00 2001
+From: Dan Allen <dan.j.allen@gmail.com>
+Date: Mon, 20 Feb 2023 23:47:59 -0700
+Subject: [PATCH] resolves #4390 fix call order so use of an include file with
+ invalid encoding continues to raise error when using Ruby >= 3.2.0
+
+--- a/lib/asciidoctor/reader.rb
++++ b/lib/asciidoctor/reader.rb
+@@ -1197,15 +1197,16 @@ def preprocess_include_directive target, attrlist
+           push_include inc_lines, inc_path, relpath, inc_offset, parsed_attrs
+         end
+       else
++        inc_content = nil
+         begin
+           # NOTE read content before shift so cursor is only advanced if IO operation succeeds
+           inc_content = reader.call(inc_path, read_mode) {|f| f.read }
+           shift
+-          push_include inc_content, inc_path, relpath, 1, parsed_attrs
+         rescue
+           logger.error message_with_context %(include #{target_type} not readable: #{inc_path}), source_location: cursor
+           return replace_next_line %(Unresolved directive in #{@path} - include::#{expanded_target}[#{attrlist}])
+         end
++        push_include inc_content, inc_path, relpath, 1, parsed_attrs
+       end
+       true
+     end
diff --git a/dev-ruby/capybara/Manifest b/dev-ruby/capybara/Manifest
index 5666d2927582..d5b29eeade3e 100644
--- a/dev-ruby/capybara/Manifest
+++ b/dev-ruby/capybara/Manifest
@@ -1,5 +1,6 @@
 DIST capybara-3.38.0.gem 379392 BLAKE2B e1ba89daa08e43e5f97ed5c649a3ea82c27e2ee7a737844f83ba68f0379cc4ef2a0349bc2ae9af76a5cca3659c11f1ed0d1b7dcae7f7701305ca3644e40a4dee SHA512 530db1102e8bc1bfa1ac55d28a725a26a7c6c98baf89655bb15436217e99c7131edb204638f51831c416e4898b9e7c653b83c74abf8aa644eb4da0ad8cddd44c
 DIST capybara-3.39.0.gem 381952 BLAKE2B 2b70bfbf930258c2273bf0c6bddc70e455d1d717bd0ed79fc68459c6f40d47ef8149fec161dbaff08e6d8424aebbdf5160033169a6269408b368525218899e23 SHA512 0910ecef11a007d10e753887d9016bab4de74e2ddf2fa2c8b8fc32bfe7d71d64a8c0b72a0a606aa7b558922ab02b4368d1c42a0df78ecf3f68a5efc34edc8707
 EBUILD capybara-3.38.0.ebuild 1831 BLAKE2B 5d6340331a0bfaccce476f8b1a1fc060a0de11d3cbd4601f37326d5d698dc3722cbb8bdd8dd15b63af51d61c9abaed7268743338760f21d009600c94f541c1eb SHA512 c3eef527dcf786987fb191c0a17ddac3c98306f561c1ded71e9e078105f861a2eabfea9aa7324991f5b92b4324269b6115af7db2ee8c9aebecedc399d6e5fbe5
+EBUILD capybara-3.39.0-r1.ebuild 1843 BLAKE2B b9a42412e45203a2438154794e28e5e6040df53441b25d7e3c8a0ea05547b5430de749e2f8d0f30a3abc42348da62dd6026f3113a861d7eaa25f94aa5fed9f52 SHA512 a65d1f3e5062dd023b2553c04642382208b6fc6d424d910ce234f1b5a99183477bc8b09b761a5fcd150bbef0c631162dd01d6b5be2938e529a573a5fc1f87211
 EBUILD capybara-3.39.0.ebuild 1836 BLAKE2B cf058f6b49569909a549b9590015dd5c4f75c1161a15b2e934659e99efe5524bb43240b84c3cb48c5b5c62f026de339195224850992c68ade82b8b68b37741c3 SHA512 0377bf0eed16add06515e6d70197fd3112dd48c0a7642c345be6a567d0608fe993576f0610c16b9e164aad2d608fe90749925da5bfd9ccf54341c9be5d08b688
 MISC metadata.xml 348 BLAKE2B b4194195a69c268721e6cd93da0b2c991fdff4528d4835e8a9717ca6b378a9b48930265f6312334d6ee59de19a7b683258a4767c7f436d2fc53a62b1fff600b5 SHA512 ef3fc6dfd16d2111ead7891ee86eca1f2252226a5e35a94182e3a052d5c63299e2e206e09f6f3062ca85b1a31c893a43232807216dd01ef30dd227fa94449c28
diff --git a/dev-ruby/capybara/capybara-3.39.0-r1.ebuild b/dev-ruby/capybara/capybara-3.39.0-r1.ebuild
new file mode 100644
index 000000000000..daa72adcbeb3
--- /dev/null
+++ b/dev-ruby/capybara/capybara-3.39.0-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_EXTRADOC="History.md README.md"
+
+# Rake tasks are not distributed in the gem.
+RUBY_FAKEGEM_TASK_TEST=""
+
+inherit virtualx ruby-fakegem
+
+DESCRIPTION="Capybara aims to simplify the process of integration testing Rack applications"
+HOMEPAGE="https://github.com/teamcapybara/capybara"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+SLOT="3"
+IUSE="test"
+
+DEPEND="${DEPEND} test? ( || ( www-client/firefox www-client/firefox-bin ) )"
+
+ruby_add_bdepend "test? (
+	dev-ruby/rspec:3
+	>=dev-ruby/launchy-2.4.0
+	dev-ruby/selenium-webdriver:4
+	|| ( dev-ruby/sinatra:3 dev-ruby/sinatra:2 )
+	www-servers/puma
+)"
+
+ruby_add_rdepend "
+	dev-ruby/addressable
+	dev-ruby/matrix
+	>=dev-ruby/mini_mime-0.1.3
+	>=dev-ruby/nokogiri-1.8:0
+	>=dev-ruby/rack-1.6.0:*
+	>=dev-ruby/rack-test-0.6.3:*
+	dev-ruby/regexp_parser:2
+	>=dev-ruby/xpath-3.2:3"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/d' -e '/pry/d' -e '1igem "sinatra"' -e '/statistics/Id' spec/spec_helper.rb || die
+
+	# Avoid window-manager specific tests (sizes are specific for fluxbox)
+	sed -i -e '/#maximize/,/^  end/ s:^:#:' lib/capybara/spec/session/window/window_spec.rb || die
+
+	# Avoid spec that requires unpackaged geckodriver
+	#sed -i -e '/describe.*register_server/,/^  end/ s:^:#:' spec/capybara_spec.rb || die
+
+	# Avoid test dependency on puma server for now
+	sed -i -e '/should have :puma registered/,/^    end/ s:^:#:' spec/capybara_spec.rb || die
+
+	# Update spec to catch the right error code. This seems to have
+	# changed recently across ruby versions.
+	sed -i -e '/raise_error/ s/EOFError/Net::ReadTimeout/' spec/server_spec.rb || die
+}
+
+each_ruby_test() {
+	virtx ${RUBY} -Ilib -S rspec-3 spec
+}
diff --git a/dev-ruby/coffee-script-source/Manifest b/dev-ruby/coffee-script-source/Manifest
index 268d44cb8e2d..812abdbd7c6c 100644
--- a/dev-ruby/coffee-script-source/Manifest
+++ b/dev-ruby/coffee-script-source/Manifest
@@ -1,3 +1,3 @@
 DIST coffee-script-source-1.12.2.gem 65024 BLAKE2B 7796ea3b031fe04ff286c023d5de62a1bccff6bef7aa6b0eb01e92bdae59f2e46134c0efae36d647a07cb0dcea61d7da5bf47d1197bdd02a4a2daf0edcbae743 SHA512 f20dfc576202e5100f297e28481ac4e61776fd6684600ce5949b5deb26bfbacd74ae183462fc3cdaa81f95eb95729cd520b72841f70b6b4b133b1eea08ed6fcb
-EBUILD coffee-script-source-1.12.2-r1.ebuild 463 BLAKE2B fe453f554ff6476bf4a72f43796056e80aff9737c00f4471c6c326bac0f995d03d490930efa1848b2e604b3311c934cf1e4c831d94d3fa81fc6902f5dfaa078f SHA512 34ab66d0e04623ecd7595ffa051646db3b1e5c6f2b98d8c85c3533571f78df42a6f216ca7e5e216b7f3e2978b723100d998729d34be4ce939ca088cef042a947
+EBUILD coffee-script-source-1.12.2-r1.ebuild 463 BLAKE2B 68453bef60fcc636bfef5e414cce0a9fefbd5f98c6281834f41b2862a0e5c866b064260d2376fc2ab7c3e7ffee8bff2eb55f554828c0dc09d8bc4fb69275d791 SHA512 a791101def4eaaec65b178e2027574ed9918ab6665b458e68080c01e7308645e5106167de8b27a3919a10f8c28ef4acd6b70bc5436bf836fee14ae579b5fae12
 MISC metadata.xml 248 BLAKE2B 0c876bde3c72e61d28284a95a837103e6d594c9f6fccbd6d7d1039f9c5a604347c20c334c9a57d80b152888fed536196f2807b477e8d0336c80affb0e28c9dc9 SHA512 b2b64178cf6cbbaa5fb4671ffe1ab88b83c920de363ae099ef74fa3e5eb8c8f0285c749cabc0cebf344951503d1b7309ae294afe9e7cf5172700182d8843fa14
diff --git a/dev-ruby/coffee-script-source/coffee-script-source-1.12.2-r1.ebuild b/dev-ruby/coffee-script-source/coffee-script-source-1.12.2-r1.ebuild
index f6b8b758bf82..e7babbfde0aa 100644
--- a/dev-ruby/coffee-script-source/coffee-script-source-1.12.2-r1.ebuild
+++ b/dev-ruby/coffee-script-source/coffee-script-source-1.12.2-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=7
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
 
 RUBY_FAKEGEM_TASK_TEST=""
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-ruby/coffee-script/Manifest b/dev-ruby/coffee-script/Manifest
index 015c959c8694..d251dd04c72c 100644
--- a/dev-ruby/coffee-script/Manifest
+++ b/dev-ruby/coffee-script/Manifest
@@ -1,3 +1,3 @@
 DIST coffee-script-2.4.1.gem 6656 BLAKE2B d670da7888dfc576f7bc07f1d46e82c954d784ae9fb5c3aa094a9d58a74e4e6b12af5b0ab16940de9c8867871dae425cbcf14f1a36d4753367b28785e8c7a1da SHA512 5f19e3dd099408c633243d110fb6a3aece7753eed398c6568388b943a4a068fd5c2085f4e5408ebb7ea7eef529154995fe6e8ca4d437d491ec728a876bfd6492
-EBUILD coffee-script-2.4.1.ebuild 608 BLAKE2B 2f198b99a5cbfb97ec461ab755c81cf83c0d3fa0109f02e3e95f11279631d891ca8accd2996ba50eb09c34ca5f9f6ccac9a727550fc13a46602de4545d9689f8 SHA512 b0fd5c2bbea81bb3a91f6501f5271f7c5936dd6eaebf0b795389c1eef42b813999e07c12c92d29413874321f5deed55a728f8170ec94190e5482d21d56eacbbf
+EBUILD coffee-script-2.4.1.ebuild 615 BLAKE2B 42773b69248db443e8f5e87bc54a09a68d1060da2c7fdef3b141a1efa625bb425a183f7a038de50d93a358e03ca47428cdd8b864bb6656fa53d3974260a4e220 SHA512 19cdad89fdde26548e17891a8abfb487034e2eca74be81c7b198676e0d5333c94aa96ca8fb723b1f4470f6feb34d632de1133b180509c43002787004b81097a2
 MISC metadata.xml 345 BLAKE2B 3232bcf8400900fbf6aa03385a16e5bb26c1901111f2ee243d8c49e20e6f63157243192e09aaf9d1316daa3954b882a6fbbd5a59e11d2dd069a5a4bcf0504dd1 SHA512 001483acf323feba5fd91a7f32eb7e54b68b9e7f40d0346603d70164cb10c8bcb7944af313744c57a10a2c0cd788600ff77dea9ab2f7a54d29fdab986a0e35a2
diff --git a/dev-ruby/coffee-script/coffee-script-2.4.1.ebuild b/dev-ruby/coffee-script/coffee-script-2.4.1.ebuild
index 37dfb3cfc2bb..932faa59f255 100644
--- a/dev-ruby/coffee-script/coffee-script-2.4.1.ebuild
+++ b/dev-ruby/coffee-script/coffee-script-2.4.1.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 ruby30 ruby31"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31 ruby32"
 
 RUBY_FAKEGEM_TASK_TEST=""
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-ruby/globalid/Manifest b/dev-ruby/globalid/Manifest
index e5a4c62d4245..a0f20a9e1e82 100644
--- a/dev-ruby/globalid/Manifest
+++ b/dev-ruby/globalid/Manifest
@@ -1,3 +1,4 @@
 DIST globalid-1.1.0.tar.gz 21131 BLAKE2B 74f49046e84421df1ae4640cf1ecc23d6c09d4a7176583a4662fa89b031ec9c142c09d13b90dfd40cb23417aec3285a93366f975600b2b52b11a62f62878b313 SHA512 42d6fbdaa4de42da6677d620420c96989ed358197b36f4f0e4b4304a4c8a0f2df7d91c0de84381fb0fec87c213d3ba00335e95d92ae2bce59fe7ac7863219c1d
+EBUILD globalid-1.1.0-r1.ebuild 772 BLAKE2B f1db9350ed9d06754325451354d4f6d4e431432c033c4ff1890ec4774cf4d09915cd06c5f2a9bc188b59e6be6856ec61e02c349f56827c86df9932dc10fb6a8e SHA512 5ba7c54bdc77d9c63977b094e50aaaa3bec8c0e4c3ce5aafe53ed0aa537ac3f21565d147b2729cabece5c2393aeb8317223c03dd69ab300d98b874c4536df08e
 EBUILD globalid-1.1.0.ebuild 778 BLAKE2B a5548966f82286428daa69ac4a2ce970f635fdd7c5a7891cbd6cc884c318b3aba06862e48cf8fd125b4acb7c2b6f93434a9ea7733b34fb5780baadbde004045a SHA512 65402c76d5afb95fd0b927c8f4fd23e5f3d78931abf8d3706c0a57847d38394df7ef3e448efed8e127f1780b35ece3fea73f723f502e162539df6b1d5b3f2bfa
 MISC metadata.xml 341 BLAKE2B e15397f0d2b0ce51ddb3da642f55ca1ed8ce12d69621757ac84ac8649108faa27948164eb1adcd1f5e1aee48b5cb2d01a2c75faf93285bb06c33841f04805600 SHA512 330c1a59a0a77ee5e02a685fb2b6884c16f99028960c308319077b2815a0b86eb4e320bbcae48fc4efadf80931da56ab2163c8b51b544d18c6aab896053c5733
diff --git a/dev-ruby/globalid/globalid-1.1.0-r1.ebuild b/dev-ruby/globalid/globalid-1.1.0-r1.ebuild
new file mode 100644
index 000000000000..22e6caa87ce0
--- /dev/null
+++ b/dev-ruby/globalid/globalid-1.1.0-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="globalid.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Reference models by URI"
+HOMEPAGE="https://github.com/rails/globalid"
+SRC_URI="https://github.com/rails/globalid/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/bundler >=dev-ruby/activemodel-5.0 >=dev-ruby/railties-5.0 )"
+ruby_add_rdepend ">=dev-ruby/activesupport-5.0:*"
+
+all_ruby_prepare() {
+	rm -f Gemfile.lock || die
+
+	sed -i -e '2irequire "forwardable"' test/helper.rb || die
+}
diff --git a/dev-ruby/haml/Manifest b/dev-ruby/haml/Manifest
index 814a0ce086cb..93bed4098346 100644
--- a/dev-ruby/haml/Manifest
+++ b/dev-ruby/haml/Manifest
@@ -1,5 +1,6 @@
 DIST haml-5.2.2.tar.gz 129833 BLAKE2B d68c24c7a3c817d6d364b2ec92b84b4f56f4fffa48b99d17b2df27da35f50b1fb1f69b184a7b21d899c476e0d4c8ad2b940a7cb2995ec24ecdafab8ef61fe393 SHA512 1aec59fab20d8139a5dfedde2007fa8137a377a345e4d30229f9d1140d56cdf970c8ae70e2647e6a408d7fa543a16050f66a8a636efa6a6b1f91ee1ffcc136c1
 DIST haml-6.1.1.tar.gz 669644 BLAKE2B 239b3a1fe02bcd1e2981198ba7c54c71ca2af0947102fcea6cd600cc6579294856baa290589a7d3a015e54df8bcecf8e50175cf2189e8f4f9c6f9721a558bcc9 SHA512 7d732be085b41b8f0eec418600a82b51c68301081165aa636fa342ae26b74215a202a4b15e592da980d9a7fbe24bad01399f599770420133c4b6ab7523386fa5
 EBUILD haml-5.2.2.ebuild 1496 BLAKE2B 1abadf57965798595ed08da1de7b19b0635a05ead6287e29e8902c2a69de9a69b693d3e282ba51468f6ed4c83a455c63f539020274c4e8332f8e933dec8d233c SHA512 3828bbbf977f0157e3669c425b870b8faff8260c94be80b3f08b55c04b2654a763e24f0b82d6dd4deb79075f0d85741e34462aa020903f01dc0c3c5f4eb43d4a
+EBUILD haml-6.1.1-r1.ebuild 1636 BLAKE2B 8debb15864c0aada3b2f518bdfca389c758ca9f1614fa5b6e90f4c9e69cd97b3941921908a0e9b54d8b917e54cfffe1eeadf6f57cc8b02a3ad5ba5444ae4a2fc SHA512 33b20278c4b44a9c86ac02604b1fc2887c24a30059cb1be54955a2414dc76c4509e2c1cc94c53bf70374cb8541e36a2b6c7f2ec041e0dac7bc456d461dbf2c0d
 EBUILD haml-6.1.1.ebuild 1520 BLAKE2B fa676f2d2e9e21dfb3e8a9c51822e940dd6a51229671b7daf05afa107463236d5ff96ffa8753ac8ed276115d2e0d4d19b79d9d6e5ba9f987eed4fb975ae40083 SHA512 7f3e61e6830681e28415d943a43e08716ac7d3825e2a4f0637d5105b70388c12a6235e7421dda623dcff07390c910725bf580a6332cd06d896d4a75276cdbeaa
 MISC metadata.xml 384 BLAKE2B 49a1ec969b1de2c61646aef404bcb19961d7f7b6b8c0324c1f447c8847adb0d3667e653b4273ed1c7e177e7e5216e6275a7c664ee6917ecb48e69d89554a33c6 SHA512 047f50785afcb708d07a770c38e40d7c8be01455832f01bbd006608eb18af8a8470a21ab0c57b7304ad4e2be39121310d0feb1ac64163a1b5e4c1cbf61cb8bfb
diff --git a/dev-ruby/haml/haml-6.1.1-r1.ebuild b/dev-ruby/haml/haml-6.1.1-r1.ebuild
new file mode 100644
index 000000000000..2cfae3699c8e
--- /dev/null
+++ b/dev-ruby/haml/haml-6.1.1-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTENSIONS=(ext/haml/extconf.rb)
+RUBY_FAKEGEM_EXTENSION_LIBDIR="lib/haml"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md FAQ.md README.md REFERENCE.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A ruby web page templating engine"
+HOMEPAGE="https://haml.info/"
+SRC_URI="https://github.com/haml/haml/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm arm64 ppc ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+IUSE="doc test"
+
+ruby_add_rdepend ">=dev-ruby/temple-0.8.2 dev-ruby/thor dev-ruby/tilt:*"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/minitest:5.15
+		dev-ruby/nokogiri
+		>=dev-ruby/railties-6.0
+		>=dev-ruby/activemodel-6.0
+		>=dev-ruby/actionpack-6.0
+		dev-ruby/unindent
+	)
+	doc? (
+		dev-ruby/yard
+	)"
+
+all_ruby_prepare() {
+	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	sed -i -e '/bundler/ s:^:#: ; /Bundler/,/end/ s:^:#:' Rakefile || die
+	# minitest hack just to match rails/activesupport
+	sed -i \
+		-e "/require 'minitest\/autorun'/igem 'minitest', '< 5.16'" \
+		-e '/bundler/I s:^:#:' \
+		-e '/simplecov/I s:^:#:' \
+		test/test_helper.rb || die
+	# Remove tests that fails when RedCloth is available
+	rm -f test/haml/filters/markdown_test.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:test:. -rtest_helper -e 'Dir["test/haml/**/*_test.rb"].each { require _1 }' || die
+}
diff --git a/dev-ruby/hiera/Manifest b/dev-ruby/hiera/Manifest
index 22f68941407e..511e32afb103 100644
--- a/dev-ruby/hiera/Manifest
+++ b/dev-ruby/hiera/Manifest
@@ -6,4 +6,4 @@ EBUILD hiera-3.10.0.ebuild 526 BLAKE2B 3bc71b2da6c48f2b2b332cd86aeab10a314b4b957
 EBUILD hiera-3.11.0.ebuild 526 BLAKE2B 3bc71b2da6c48f2b2b332cd86aeab10a314b4b957b7f3bfcdf5816ee7f688b3a36d16cf090eed87f60656f0af99a3131cede33e8671c8283393f18f1a30bbd8b SHA512 b5a4c3c60e20a6dfaea3bf44c64ad17a914b66dbd734fc5cb583208340257551a229ef8975904aa209ae11a96e0e84f85c19a968c96840282535db24fd23ce59
 EBUILD hiera-3.12.0.ebuild 523 BLAKE2B eb173a0e1660f1ac5ff8a9d29d4b5bd8df7afdce6a8e43e644465f5e5a96cb207aa0004681431c46f4d12a267086d61efeccf2e3d3a022df6bd6f8478cc04740 SHA512 36e91ccd3cb35078775aefc5244e2a5bd972158ba168014b44849552ecfdb64acbeb64e34d4a38beb488fc48ada6c6752ae60e304419bf71cf105ebf22319da1
 EBUILD hiera-3.9.0.ebuild 523 BLAKE2B 1b7a4f94b843d62acb9c728aa02a90bc61eef8f171e0a63de00900a69024f8e12b97d50576a0ab08f3e56fd1196e0e9785c6502cbb6fa61476a39e00d8c0bf05 SHA512 09ebd67149a83f9bcd406a5945bf3f0ad52d9a795dd5a8e8ce56f2e0975a0e089697c3b8c1e01defb18b864fe58690eb5c2b3e6fbb1616227a5724f5408d8550
-MISC metadata.xml 442 BLAKE2B 108e882fb6805ccf19e6fa6754abfe678659b6d6f7572b57ea33a96515535b61637229d9338b67631c02648565435200d09605d13c2c61febada77ea75e4941d SHA512 6fddf1ff56b57c26963b6a42f4e0552c77090dbf7a97a6076cbedec86b38c0204455c390c335b4ff1749235f1cdedbe49379bae5e65eb94340cf3103ca9e320e
+MISC metadata.xml 539 BLAKE2B 2ab251f81a6d217fdcfc23b22377f1bff2fbe5aea789ec567326cbac69adb3e3f192bc3666055421731872ed324e0d66246c6067b08c964dd7412bf0befb792b SHA512 e1c61ea7231ce95f3dea7cc178d10865858bbeedf2e1f14c2d6c78e2af0840ba45836ff3f5b85a8ba62f5342f37b365b9706ace2a306f1dc209487c303b3d0c0
diff --git a/dev-ruby/hiera/metadata.xml b/dev-ruby/hiera/metadata.xml
index d9c2b80ccf99..7604698badec 100644
--- a/dev-ruby/hiera/metadata.xml
+++ b/dev-ruby/hiera/metadata.xml
@@ -1,15 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>prometheanfire@gentoo.org</email>
-</maintainer>
-<maintainer type="project">
-<email>sysadmin@gentoo.org</email>
-<name>Gentoo Sysadmin Project</name>
-</maintainer>
-<maintainer type="project">
-<email>ruby@gentoo.org</email>
-<name>Gentoo Ruby Project</name>
-</maintainer>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+	</maintainer>
+	<maintainer type="project">
+		<email>sysadmin@gentoo.org</email>
+		<name>Gentoo Sysadmin Project</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">puppetlabs/hiera</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/marcel/Manifest b/dev-ruby/marcel/Manifest
index c8f5bd064e06..b2cb1c97b18c 100644
--- a/dev-ruby/marcel/Manifest
+++ b/dev-ruby/marcel/Manifest
@@ -1,3 +1,3 @@
 DIST marcel-1.0.2.tar.gz 8305198 BLAKE2B 264737cdb29852a186bf0e719748caca6c63626528f486dbefc3eedc7df6d7fe6f34e5cf68eb8b04f8b2b75c52bed59222d5f7bbcf60047cd5db7c4c935802ff SHA512 cd159545b246dcbd26ca07ac69e36ff13a965ac0e99ebd040c53b6a92f8ec8fd65786783c9a173d669fe6b32340a23d72c83c483011eec2e1097bdea73810ed6
-EBUILD marcel-1.0.2.ebuild 774 BLAKE2B 22facae204135ae18d1a32dc12f52c9d29ca9684e9aec894f8d1cce47986a0699f608333a103adc0dae006fb67b208da89999caf871a8d749c7581f7ef564cf0 SHA512 845d2e66b3eac428a1b280fd1a1f8b0d79aad723cdb3cb3c042bd971002b6bad910b36daa7609bccf785866e3f6d9e2cf92da887b9ca5fb2fba616c02e3c17d3
+EBUILD marcel-1.0.2.ebuild 822 BLAKE2B 49ac19ac929f57227fab5c14eb7574ab80ad2000c867b8ecf8e8e2334b925f5adb4677f501efd7d614e5a8a36017aaa4e1967f29a435db281d002ea0db1f1bb0 SHA512 02645febed5eb505d6b879db31ab1fa22ec581d08a9af786b4521b44428bc4466c8d179caf3457e4880b81940a3395a7cb377ca9b8d99678a1127cce52ea8c8d
 MISC metadata.xml 342 BLAKE2B 44cc52444c7ccbf38932c88133d066cd0740c8eb8538fca85665e6d7d17aa75e92ddfa941b37226a61c577c520e7240c6754ce5d94086f426cafb9b2483ccedd SHA512 59eb5165fb820bd9a0484522c5a73942d7679a2eb2e7324a4b5050c4dc3cc28089fee755de0f1e117ee31c5d6fd3488e0b5c009de884431205febace1046a8ad
diff --git a/dev-ruby/marcel/marcel-1.0.2.ebuild b/dev-ruby/marcel/marcel-1.0.2.ebuild
index 69a4dd10a987..44738adb4fa8 100644
--- a/dev-ruby/marcel/marcel-1.0.2.ebuild
+++ b/dev-ruby/marcel/marcel-1.0.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
 
 RUBY_FAKEGEM_EXTRADOC="README.md"
 
@@ -19,10 +19,14 @@ SLOT="$(ver_cut 1-2)"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE="test"
 
-ruby_add_bdepend "test? ( dev-ruby/rack )"
+ruby_add_bdepend "test? ( dev-ruby/rack:2.2 )"
 
 all_ruby_prepare() {
-	sed -i -e '2irequire "pathname"' -e '/byebug/ s:^:#:' test/test_helper.rb || die
+	sed -i \
+		-e '1igem "rack", "~> 2.0"' \
+		-e '2irequire "pathname"' \
+		-e '/byebug/ s:^:#:' \
+		test/test_helper.rb || die
 
 	sed -i -e '/bundler/ s:^:#:' Rakefile || die
 }
diff --git a/dev-ruby/mocha/Manifest b/dev-ruby/mocha/Manifest
index 79bd60d4528e..9149e005d9e4 100644
--- a/dev-ruby/mocha/Manifest
+++ b/dev-ruby/mocha/Manifest
@@ -2,7 +2,7 @@ AUX mocha-1.16.0-ruby32.patch 1889 BLAKE2B ac383ca88d04a78751109cb03a3ab83692cac
 DIST mocha-0.14.0.gem 82944 BLAKE2B 50a066e2f5007df08a7f76785fd4c2b12327b4969c11324a0574c707bea3219d51edb9ab40635378c16b46ad826ec7eff42434a27cd61113a6f40251fa2e6930 SHA512 918e45f2ee761c7dc399c7958e4d406f9e186c90f479fd01a421aa542944b47e9b2c5e938f4fc5292a7da345726447b2d47dc5f417e114201f8a4d9893c4d461
 DIST mocha-1.16.0.tar.gz 246370 BLAKE2B c2891021c33e4038ff965a470eda3be7eac2765f7c038fef33f38cd07b8501fdb88a1dcd8d291eabb124fb0fff50c40651bf29ac4a28012b57c7a02d2ff46b63 SHA512 b7d8825771f84245e7383e4081dcb42734b9716e7bef3c1b5d49ac28850590b4beabf8d0370992e100b6340ff3cfb3113610e303de74bc33c059bd9b9910cb8e
 DIST mocha-2.0.2.tar.gz 245650 BLAKE2B 3bf56cacc99b5eeb17977cd1052c635df74aec10f20a76d843d703e68520ef434bc9111b739591dfa15b21ecdbdfb5b55037e9509683624349be83613528787f SHA512 93579390f4feaf034cd6e8905654fe8cc5c8a1f28f3d27488deeb84250114a5e04c4e7aa544f18f33b2c3887668d5fddb3a3f9bda5548d577be1522da2e09760
-EBUILD mocha-0.14.0-r1.ebuild 872 BLAKE2B 53853ae8bf87f257d689fa210a8b7d2799dbed98477aefc45be1f3aac55cd3a5491be4c063d4190460687687d57ecb05df52c0b6e73e15c94e648dab0528744f SHA512 e469ca9fd2a448affeb0a919355647e3d85793352619fae7855917be9261d52a44af1578133a51ed50da3ca5fc5f650c37fe0dd823596f727636bdbeb7ea574c
+EBUILD mocha-0.14.0-r1.ebuild 933 BLAKE2B 28076a15be9a921a81ee23d19096967bb86f21865886e8052e6edd8dbe94e038e9199c37137548d3749fa11205ab6ee6f87e17a10c1cd1f5a00d2e20ef2c9f4b SHA512 9648c9e78b6f9b52d90aa7cb2bfdcf823bd24ecc9e1a63e176eeb18e19f59b2be163cd19599352274c6b09f6be49f29284c5d493dc1a1e0f7ff922219b8f5a43
 EBUILD mocha-1.16.0.ebuild 1059 BLAKE2B 4a5b9815abd9ae4c88053b05f6a8855fb3ef1f96180f70c490020e6292004376ffd5a69ec5dee45a12ac4389d052d862d8fcfd9b844be86dcfe6cf4a04148019 SHA512 f0dac0499979c406be52ae294968dc160f06c4708224bf376a2e5e6d3e099ee38057caa3d30bcd7a4f8764cd11834dee4c65fdffd38984e3968fcc8b96935c00
 EBUILD mocha-2.0.2.ebuild 1076 BLAKE2B 929b09a37927bcbca0bff449cfcd81a8d431736c87d09afd1aea76eb2368234bdef79fc55d9af4a502246da4196b4998f77c37a24fb2397f5f16d2ddd310ba62 SHA512 223addcd1f6cac1e4fca4b2c16c75515e4a54a60afac375dafd38363290813c7105060ec13cf92399ad5e6cddb1b3082f2fb0ef0746db4275be6d20f7dbfe337
 MISC metadata.xml 332 BLAKE2B caf5137da39b091d3da2776b6219400546a5c2ee01d39759471a24a5beaac1f248be271c376f9061c0b1de49d531832b6e6cdf9be53f943d112789a8240feea2 SHA512 af0bd36bc12851a56c49ef645c95b145ef28ec2070b1bcf1fc3629526b91c20aeaa39357e997389e02482ddb19c9f3cb52acb7bb9a2f90142087ef4e874f1bd8
diff --git a/dev-ruby/mocha/mocha-0.14.0-r1.ebuild b/dev-ruby/mocha/mocha-0.14.0-r1.ebuild
index e74290463a03..d46ab5b47e50 100644
--- a/dev-ruby/mocha/mocha-0.14.0-r1.ebuild
+++ b/dev-ruby/mocha/mocha-0.14.0-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31 ruby32"
 
 RUBY_FAKEGEM_TASK_TEST="MOCHA_NO_DOCS=true test:units"
 
@@ -25,6 +25,10 @@ ruby_add_bdepend "
 
 ruby_add_rdepend "dev-ruby/metaclass" #metaclass ~> 0.0.1
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.16.0-ruby32.patch
+)
+
 all_ruby_prepare() {
 	sed -i -e '/[Bb]undler/ s:^:#:' -e '1iload "lib/mocha/version.rb"' Rakefile || die
 	sed -i -e '20irequire "mocha/setup"' test/test_helper.rb || die
diff --git a/dev-ruby/mustache/Manifest b/dev-ruby/mustache/Manifest
index dd41c8d8dff6..fd62a5547d65 100644
--- a/dev-ruby/mustache/Manifest
+++ b/dev-ruby/mustache/Manifest
@@ -1,4 +1,4 @@
 AUX mustache-1.1.1-test-ordering.patch 1206 BLAKE2B 7797403a81ed860b9bc940d07196f235722e7dd83aa42c3a8ac9200f8179284c2a6a996621f2f6332ef53fa2654772eacdbd14ce5ca0019fca54bd082a3e0155 SHA512 bb122077fa486acd9b737dcf961baeae53b766a48bc635ac48b11e675923885c8110b0095a2600f1655adb034938b04c979c1f5a5d7064d040c207f47eb4d2cc
 DIST mustache-1.1.1.gem 42496 BLAKE2B bd1becb1c296abf03cdd6c7d5a6f29b71dc6328c126dbb27420872088b3b6988ac56d91c13f669cca94932f23f4290277d9ca6597ff842ff226e092c2532dccb SHA512 91a18a374a0348317d0801d6784fedd0782d7a08f128d3ab7050e631b34e45cecd49c4b1e2a9e17204f70bf169c107a92a1e210532bd3faa98edf8b1b5e8e43c
-EBUILD mustache-1.1.1-r1.ebuild 967 BLAKE2B 48bfecf59a21ee46be9505e6b324d9e7993957d51290c206657eed94cee0ea387160214480c662dc5fd91222779a1cef749e49450d0508250d0dda8f71844f2a SHA512 92b5cbeeebee94eaee357543ea589270eeac301ddea980eb0e70f5c610655dd83868921455876ab63ade7e8877396b4da0a458fa78fd19bf4a3ca4a012aaa891
+EBUILD mustache-1.1.1-r1.ebuild 981 BLAKE2B d583a7dba788657a3e4103caea191c648bc668a42918d96687de291128cd1459e38be161736da428890575116dbe2a5bcfe2b460e72bc0751a02558b500753e7 SHA512 4cc29c5039a6f80fee6e02d3a65e43f10bc621afd16e1b849ec8e4134cf75867e43ca16e4ec407d33411f26fba5080aae815c83d0c30ff1ba4c92bbf7151304b
 MISC metadata.xml 248 BLAKE2B 0c876bde3c72e61d28284a95a837103e6d594c9f6fccbd6d7d1039f9c5a604347c20c334c9a57d80b152888fed536196f2807b477e8d0336c80affb0e28c9dc9 SHA512 b2b64178cf6cbbaa5fb4671ffe1ab88b83c920de363ae099ef74fa3e5eb8c8f0285c749cabc0cebf344951503d1b7309ae294afe9e7cf5172700182d8843fa14
diff --git a/dev-ruby/mustache/mustache-1.1.1-r1.ebuild b/dev-ruby/mustache/mustache-1.1.1-r1.ebuild
index ca025f284097..d648c8aead49 100644
--- a/dev-ruby/mustache/mustache-1.1.1-r1.ebuild
+++ b/dev-ruby/mustache/mustache-1.1.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31 ruby32"
 
 RUBY_FAKEGEM_TASK_TEST=""
 
diff --git a/dev-ruby/mustermann/Manifest b/dev-ruby/mustermann/Manifest
index 1a6d0fbc4347..189241c9484a 100644
--- a/dev-ruby/mustermann/Manifest
+++ b/dev-ruby/mustermann/Manifest
@@ -3,5 +3,5 @@ DIST mustermann-2.0.2.gem 50176 BLAKE2B 82c134d56a11178a085dc3182e61c67e6e83638f
 DIST mustermann-3.0.0.gem 50176 BLAKE2B fc77327de469f0886de782c577ac164b222bbe18074f1ec63c35a08344cfcdf9a2cb44b453c594e2b153db3055ff1e7bcf969240ade04e70be5cb85a73e486a3 SHA512 c33d41281fe2ac80c0af0c5c31dbab2068c73b9da19a4b82b387bbe551019fc115675634d932a8e56b070c3a06a85d830c982a103e6c5193aff8647f599be6e3
 EBUILD mustermann-1.1.2.ebuild 603 BLAKE2B c0030cdd5abd02a6fc23b3d4049261a6c619c980fe3cb1564301ce79a2369fcc4cdbfca730afff316462255dcc4c8e71eb52171ed53858520ce78da8ccb2048e SHA512 e81668d44272e01c6ffa99e9547d2f7286a037e65bcf853136ac4a77be4c7e9bb4914644b3e85be23819e4cf4d61872f53bc93ba5d6978f2b32065f63ec6de83
 EBUILD mustermann-2.0.2.ebuild 614 BLAKE2B 4bb950faa31a57f3674785d04ac4ebf650102840d292003bb2a3b567f690ababfc09d96d236aa9c5c648c8ac484aab076e2b3d40d7568b0a1e96fb3a1f81f2b0 SHA512 ec4bd3bc483a05c0be3942ecd9631a6315effd86deff3b8449cd936c3220cb1d1fd0d5d09ea3adcc09c6c0b8256070608a55e7fe3272419850338725c6de16d3
-EBUILD mustermann-3.0.0.ebuild 614 BLAKE2B 525e008883ca3f06b5789ca5938f8948253e9093bb9e379b589f79955939de649c70ae083d03c538e962d30e4ff99e535f954a6383493ae739c2c17aac0f374a SHA512 668a13b7734d94e2474847a1df837ead1afebe437aeeb202158936523defd0a52749f0a6a99782e061a2d4569c0327ef194d68f8b7415f92aea8802eace93292
-MISC metadata.xml 248 BLAKE2B 0c876bde3c72e61d28284a95a837103e6d594c9f6fccbd6d7d1039f9c5a604347c20c334c9a57d80b152888fed536196f2807b477e8d0336c80affb0e28c9dc9 SHA512 b2b64178cf6cbbaa5fb4671ffe1ab88b83c920de363ae099ef74fa3e5eb8c8f0285c749cabc0cebf344951503d1b7309ae294afe9e7cf5172700182d8843fa14
+EBUILD mustermann-3.0.0.ebuild 621 BLAKE2B 929ad90ea350402fb2b9f4b6a0d35eb3eab0813fbe5dd503a676d21be7c23fdeb57ac6feae4196b73cf12d7293c6c266f6e30a04f706be9e0ecf1c92eaab2490 SHA512 529000007a1dcd87fe1cb3af9285902246de0c9deef811717db3494a017269c61ddd788c3b550c32e1cbc10e433a2e8501ee1be62bb7c938f9041770d8eff60c
+MISC metadata.xml 328 BLAKE2B 4dd9fded94fde6456c8be68bbcb6b26eb82fb604099ab8c4287696574f8e3a93e96e9a57709535a59aab635dd28fafac14004794d7871b1635b18a7c88a4be45 SHA512 4c552e067a9965240ef5c9e46a16239ef7d9cef58ec4e0f724dec7e12a6f9709ce7137bfb39ab2089d1c81689d3d23c717a7a293ff43295708132542b30d64f5
diff --git a/dev-ruby/mustermann/metadata.xml b/dev-ruby/mustermann/metadata.xml
index 658c72b1920d..b4696bf49a2d 100644
--- a/dev-ruby/mustermann/metadata.xml
+++ b/dev-ruby/mustermann/metadata.xml
@@ -5,4 +5,7 @@
 	<email>ruby@gentoo.org</email>
 	<name>Gentoo Ruby Project</name>
 </maintainer>
+<upstream>
+	<remote-id type="github">sinatra/mustermann</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/mustermann/mustermann-3.0.0.ebuild b/dev-ruby/mustermann/mustermann-3.0.0.ebuild
index f8948fcfd734..20a8b4e5c86d 100644
--- a/dev-ruby/mustermann/mustermann-3.0.0.ebuild
+++ b/dev-ruby/mustermann/mustermann-3.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-USE_RUBY="ruby27 ruby30 ruby31"
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
 
 # There are specs but they depend heavily on unpackaged code.
 RUBY_FAKEGEM_RECIPE_TEST="none"
diff --git a/dev-ruby/mysql2/Manifest b/dev-ruby/mysql2/Manifest
index 17bf015ffcdc..a7087d63ef0f 100644
--- a/dev-ruby/mysql2/Manifest
+++ b/dev-ruby/mysql2/Manifest
@@ -1,3 +1,3 @@
 DIST mysql2-0.5.5.tar.gz 124769 BLAKE2B 698b18434691b2b7734c6fa314c931a38e973813a1912166838541f35c181813bff2db2c0967df72e8d9108b9ea71a030af09f39354a9c902674fab287b82331 SHA512 fa43e464bfd495d335c6f95b1897009813b7d6fbfeebe8d9c533c4f88c664a61a140227df73eb892c0314f76ebb5d0f2e06265284512dd35950bbab78d20e0fc
-EBUILD mysql2-0.5.5.ebuild 1340 BLAKE2B 859fe60a7be4584f706296d7e1fcf7f7b9219c8ebf01569118b08d5c32a8485b0da7ad06b67e573e1e229c7a1f788d947eb91b10024b77bb51a06b87be6b9a3a SHA512 6f11baa48837b335f5f6661e63c5bd9428fe702c4a76a0e3cfd796a3b7509826bf2f5516c479fbaab400b5ef0aada82651a99cec22538db823f45a6d80e9d793
+EBUILD mysql2-0.5.5.ebuild 3465 BLAKE2B 0d4ed6858b1085b7ed5a5d80ffb8831570e5ef93713ec41a9b32f4fbd4e22806f91e7691147580a485c39466618c8405228445a2708dd7ffbce652008f28e142 SHA512 8780a4ba58d98e113c46dc3c1e6a84d8a567157d00bea3ea343bc3930ae43a9e27a17db5e7d6b1ca64f795f6a79148dfc7b27345e09d43662f4d7cb08de48da2
 MISC metadata.xml 414 BLAKE2B 38309330df062150b84012dff2bacfaeccc80ad855697c841708611e167ed12f07ba7284dd4ec8d349cfe8c13c363d0c6949370ac1357057ec9efcd43b6236fe SHA512 8fa3177228145a7f3e1b2cb8d1124ad1ed3639112f17885d6464dd266858d0855ef2645954ea0238011597e3d3d99d9fcc02f6b900315c18f48386ffbe3b8ff3
diff --git a/dev-ruby/mysql2/mysql2-0.5.5.ebuild b/dev-ruby/mysql2/mysql2-0.5.5.ebuild
index b247f8f33093..5ec2338a5603 100644
--- a/dev-ruby/mysql2/mysql2-0.5.5.ebuild
+++ b/dev-ruby/mysql2/mysql2-0.5.5.ebuild
@@ -2,10 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby27 ruby30 ruby31"
 
-# Tests require a live MySQL database but should all pass.
-RUBY_FAKEGEM_TASK_TEST=""
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
 RUBY_FAKEGEM_TASK_DOC=""
 
@@ -28,9 +28,15 @@ KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="mysql mariadb"
 REQUIRED_USE="^^ ( mariadb mysql )"
 
-MDEPEND="mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:= )"
-DEPEND="${DEPEND} ${MDEPEND}"
-RDEPEND="${RDEPEND} ${MDEPEND}"
+SQL_DEPEND="mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:= )"
+DEPEND="${DEPEND} ${SQL_DEPEND}"
+RDEPEND="${RDEPEND} ${SQL_DEPEND}"
+BDEPEND="
+	test? (
+		mariadb? ( dev-db/mariadb:* )
+		mysql? ( >=dev-db/mysql-8:* )
+	)
+"
 
 all_ruby_prepare() {
 	sed -i -e '/s.version/ s/Mysql2::VERSION/"'${PV}'"/' ${RUBY_FAKEGEM_GEMSPEC} || die
@@ -47,3 +53,90 @@ each_ruby_configure() {
 
 	${RUBY} -Cext/mysql2 extconf.rb --with-mysql-config="${config}" || die
 }
+
+each_ruby_test() {
+	local -x USER=$(whoami)
+
+	if use mariadb ; then
+		local -x PATH="${BROOT}/usr/share/mariadb/scripts:${PATH}"
+	fi
+
+	einfo "Creating mysql test instance ..."
+	mkdir -p "${T}"/mysql || die
+	if use mariadb ; then
+		mysql_install_db \
+			--no-defaults \
+			--auth-root-authentication-method=normal \
+			--basedir="${EPREFIX}/usr" \
+			--datadir="${T}"/mysql 1>"${T}"/mysqld_install.log || die
+	else
+		mysqld \
+			--no-defaults \
+			--initialize-insecure \
+			--user ${USER} \
+			--basedir="${EPREFIX}/usr" \
+			--datadir="${T}"/mysql 1>"${T}"/mysqld_install.log || die
+	fi
+
+	einfo "Starting mysql test instance ..."
+	# TODO: random port
+	mysqld \
+		--no-defaults \
+		--character-set-server=utf8 \
+		--bind-address=127.0.0.1 \
+		--pid-file="${T}"/mysqld.pid \
+		--socket="${T}"/mysqld.sock \
+		--datadir="${T}"/mysql 1>"${T}"/mysqld.log 2>&1 &
+
+	# wait for it to start
+	local i
+	for (( i = 0; i < 10; i++ )); do
+		[[ -S ${T}/mysqld.sock ]] && break
+		sleep 1
+	done
+	[[ ! -S ${T}/mysqld.sock ]] && die "mysqld failed to start"
+
+	einfo "Configuring test mysql instance ..."
+
+	mysql -u root --socket="${T}"/mysqld.sock -s -e '
+		CREATE DATABASE test1 DEFAULT CHARACTER SET utf8 DEFAULT COLLATE utf8_general_ci;
+	' || die "Failed to create test databases"
+
+	# https://github.com/brianmario/mysql2/blob/master/ci/setup.sh
+	mysql -u root \
+		-e 'CREATE DATABASE /*M!50701 IF NOT EXISTS */ test' \
+		-S "${T}"/mysqld.sock || die
+
+	# https://github.com/brianmario/mysql2/blob/master/tasks/rspec.rake
+	cat <<-EOF > spec/configuration.yml || die
+	root:
+	  host: localhost
+	  username: root
+	  password:
+	  database: test
+	  socket: ${T}/mysqld.sock
+
+	user:
+	  host: localhost
+	  username: root
+	  password:
+	  database: mysql2_test
+	  socket: ${T}/mysqld.sock
+	EOF
+
+	nonfatal each_fakegem_test
+	local ret=${?}
+
+	einfo "Stopping mysql test instance ..."
+	pkill -F "${T}"/mysqld.pid || die
+	# wait for it to stop
+	local i
+	for (( i = 0; i < 10; i++ )); do
+		[[ -S ${T}/mysqld.sock ]] || break
+		sleep 1
+	done
+
+	rm -rf "${T}"/mysql || die
+
+	[[ ${ret} -ne 0 ]] && die
+}
diff --git a/dev-ruby/patron/Manifest b/dev-ruby/patron/Manifest
index 287e880c096f..c502eef96d58 100644
--- a/dev-ruby/patron/Manifest
+++ b/dev-ruby/patron/Manifest
@@ -1,4 +1,4 @@
 DIST patron-0.13.3.gem 65024 BLAKE2B 87aa69aab49978d14a80ed9e09d74d7853da3512875cc3aecd3f387d1523b85c84625b57a5826e5f5f999cec4feaae58c1aaae96582144a5c9dc537c9d5a4224 SHA512 afbbbd9570e338a5d1b97b4ebeda76ac95a22c29d908629723d345a47400183c2ccee67ebcaf5b6f9ecb032eb3b847e70ec9eebff75b33045a3665c215abfbd0
 EBUILD patron-0.13.3-r1.ebuild 1084 BLAKE2B 7d53441760d58fb108e90024b38d9e1223f6b824235974f87fc064f01348f01140a8045f92b9a0a98ee34316583019a97601f0b0e8a31a7ccf050a2f43cc625e SHA512 d62a2524588c840d7eac8df3f5d920ccefb138a637fe3bb2e56e225d8bde2660bd05ee8f08ac2c41ba09350390ab194e50d92581270f3eccb1eb4696e600db0d
-EBUILD patron-0.13.3-r2.ebuild 987 BLAKE2B fd8359c1df29bac5a08a5d8e0c0153bff178c10239594835183e6c4cf03d6fc39537a5699c003dfe02f79700af3bfc89b55abe8d7baf314ad2aaae4a9830ba7b SHA512 dc1eb9087270b7f6a5d9446ba903459547f61db39febe73bf030c1b438ce1f2f9d409005a31033fe623e4169b8451ba3506a91ea5bbda31a8730f88036222503
+EBUILD patron-0.13.3-r2.ebuild 1016 BLAKE2B 8dee1971033628f1ff5c50a5c87ff382fced7bd6e5c6d62c3b17d6221d1b4d405b4da6d323d777a9dbf6d1a0336031ab33a4c15ad218ec8c7b93e609b8ef1d26 SHA512 ff9c3b966d05d1a44645a5f5933a4017225cf7ad7dfb2bcca0a905a04ae23555395b58cd43c1bce56558290f30d6c5be0fe58f06f2e1ffbda9df3ef5121408db
 MISC metadata.xml 324 BLAKE2B 80545356beebac06bf5b95f99be2f12fbb2fd4284e28036de156f75bef023216880bea03c9497123b0c111d4d37902b6ba3d9cab37ce5bc47b19e9d3e5e944f3 SHA512 1f260c57a3cce5424764eb1f287734d7e7093e08ffcdcac0c2f8ffe3c54a1aa53b21c008783b4a8b68bf20270d988b0ec108e9c647cafe347898a29d08b6a1ea
diff --git a/dev-ruby/patron/patron-0.13.3-r2.ebuild b/dev-ruby/patron/patron-0.13.3-r2.ebuild
index 5c3884367749..8eab88483eb2 100644
--- a/dev-ruby/patron/patron-0.13.3-r2.ebuild
+++ b/dev-ruby/patron/patron-0.13.3-r2.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/toland/patron"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 DEPEND+=" net-misc/curl"
diff --git a/dev-ruby/puppetdb-termini/Manifest b/dev-ruby/puppetdb-termini/Manifest
index 31229be4c376..b2d0cf151358 100644
--- a/dev-ruby/puppetdb-termini/Manifest
+++ b/dev-ruby/puppetdb-termini/Manifest
@@ -1,5 +1,7 @@
 DIST puppetdb-termini_7.11.1-1stretch_all.deb 22652 BLAKE2B 776f7254062c4864236236101e79a8010ecc83a468c8b6dd14d005c4045fc695494cbe7fd468ad642bb6a13d3f8578db3c5a92981e03a21d4622a1ef5a9fc106 SHA512 5c2f6279f5ed8cdb6401a9b87f9c8e2459f1c5e1b4327224b5db9b9349ae4c20ed3237cc0e0a5aa4cf89763296cc9198cbfd33780fad224bbbaf0e11cbb29e97
 DIST puppetdb-termini_7.12.1-1bullseye_all.deb 22644 BLAKE2B 16c62aafca8ea2a1f04e6e3708bd1354262dcfdc2afd085e4ef2c949409e4ed9a21fb965b9b67099024d9027b996bdbbc3bf16bbdf92f6cfa6e8d0b4b7c60c90 SHA512 4fd214c02e71a038ba52b2cc2ad33172ab5a13739e831fa1f53fbba45b7f19644104fe06cd12c796eb81556dcf9c5221cd9341d55a4b803c5d005f1da4deca46
+DIST puppetdb-termini_7.13.0-1bullseye_all.deb 22548 BLAKE2B 535a3f846a7a10dcfaec4447ae852c6c4d870a573169f84e31f61c361164caea989f911df2d18e183c391dd0130a10b9422057eecaab304bebbb022f78e22a21 SHA512 3c8e440bfc55579d0c9a03ecae516d4cef49512ad9fdd6fceef37618c163ecac6d77a2b17b6cbb7131ceb3787904486bb78eef84a36a5f76672918db6d30db86
 EBUILD puppetdb-termini-7.11.1.ebuild 684 BLAKE2B b995146eac2af6c69846794b7ec548aa0ffa45d0d23ef3edab503e81cddba6be04bb3e4f2cd02b9c69d6b79c20c7a3cd947fae815ce9e197b821fb8e21f12283 SHA512 62f4111a4e694ed4f2d929b191e071c30ce272730eee887cbdf0018b4ce5dd04531d80a400f14153c764f73622c9774e34583c722055e956e4d0e45685909c16
 EBUILD puppetdb-termini-7.12.1.ebuild 686 BLAKE2B dcb37cd56a3e2d4df6da558d1e31f2a1ee590dff25ec48d8adab3e587e0759e8b4d2c72f5c769fa0af32d976cb246fe3f5c9b00c9959bd7d9b1975207af47fbb SHA512 c24232a9896121692244520a61d92ed962272187bb3a92054640202baf018302f58a4cc078818d6867d91f176c1080fba1f08a64b282fc126cda3a7c5d6eb445
+EBUILD puppetdb-termini-7.13.0.ebuild 688 BLAKE2B 3993f522a0979c8393f2a5ccfa58252ded6d25c999a2480f78c99287f898686ea299e12bff495981c8fa8ed0a803e06e952969d33bbb87c82dc9c845f0a5fab9 SHA512 a02c70b0c1ce42ee85c8102b52f5c1bf36be778b05e9f97fe593ff071a868216f008af10216fb4edbdf296338bc2102035394b6a3befdbbdcade5bd43f40dabb
 MISC metadata.xml 367 BLAKE2B 46ba9e83a3422a65265eba357896709907ac39b394d1d02ab02d70a0252a0470944a2fc23a44bf6c76b3562f90d8f6d9f6c28055d8458ce3cecfd2e3d2c347a4 SHA512 1fbf96c090522cccba0daa607ee8edadf107ebc38abaa66ce9a8465a1e0cd1e92f748e95ed5e7e490350191b2cc03460e8e9632a7de7550662e83a098dd47335
diff --git a/dev-ruby/puppetdb-termini/puppetdb-termini-7.13.0.ebuild b/dev-ruby/puppetdb-termini/puppetdb-termini-7.13.0.ebuild
new file mode 100644
index 000000000000..21001dc94028
--- /dev/null
+++ b/dev-ruby/puppetdb-termini/puppetdb-termini-7.13.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+
+inherit unpacker
+
+DESCRIPTION="Library needed to connect puppet to puppetdb"
+HOMEPAGE="https://puppet.com/docs/puppetdb/latest/index.html"
+SRC_URI="http://apt.puppetlabs.com/pool/bullseye/puppet/${PN:0:1}/${PN}/${PN}_${PV}-1bullseye_all.deb"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+# will need the same keywords as puppet
+KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
+
+RDEPEND+=""
+DEPEND+=""
+
+S=${WORKDIR}
+
+src_install() {
+	insinto opt/puppetlabs/puppet/lib/ruby/vendor_ruby/puppet/
+	doins -r opt/puppetlabs/puppet/lib/ruby/vendor_ruby/puppet/*
+}
diff --git a/dev-ruby/rack-protection/Manifest b/dev-ruby/rack-protection/Manifest
index 3abe3139718a..0f61c82d5af5 100644
--- a/dev-ruby/rack-protection/Manifest
+++ b/dev-ruby/rack-protection/Manifest
@@ -7,5 +7,5 @@ EBUILD rack-protection-2.2.3.ebuild 725 BLAKE2B b65a457ddc3984143c102230fc0128ef
 EBUILD rack-protection-3.0.1.ebuild 726 BLAKE2B 4083feb02c0beef7cf258771716e2a70bb6cbc296bc42d39f322f15dbf770303e817faab09cc4e55f06b71e428646676cee19804ee364aa9518fa41d01c50baa SHA512 e7faa9d7d47927db185ab474107800d9e6e6377e95d1caa6cf56ca26c5ca99fbae7473de4ad75c21e0f1cc35d2d452ed9e039713be0694affd6988edbe54669a
 EBUILD rack-protection-3.0.2.ebuild 726 BLAKE2B 4083feb02c0beef7cf258771716e2a70bb6cbc296bc42d39f322f15dbf770303e817faab09cc4e55f06b71e428646676cee19804ee364aa9518fa41d01c50baa SHA512 e7faa9d7d47927db185ab474107800d9e6e6377e95d1caa6cf56ca26c5ca99fbae7473de4ad75c21e0f1cc35d2d452ed9e039713be0694affd6988edbe54669a
 EBUILD rack-protection-3.0.4.ebuild 726 BLAKE2B 4083feb02c0beef7cf258771716e2a70bb6cbc296bc42d39f322f15dbf770303e817faab09cc4e55f06b71e428646676cee19804ee364aa9518fa41d01c50baa SHA512 e7faa9d7d47927db185ab474107800d9e6e6377e95d1caa6cf56ca26c5ca99fbae7473de4ad75c21e0f1cc35d2d452ed9e039713be0694affd6988edbe54669a
-EBUILD rack-protection-3.0.5.ebuild 725 BLAKE2B 79d4a39b7b43bab190b9c815b57c2d7bc2718198647427063bd47b95bdb889932329d108fdef6efafa63572175fea8bfe8c1013aa2352aa0a82db657b049335e SHA512 3e9ea62ab661873206f435ac0a5178e2daa5787ca597a958c60213fbca6c575e9e68c57677a74d9cde4864684dc83c62a0cb9e4d4122b9d2f205de1e59953067
+EBUILD rack-protection-3.0.5.ebuild 732 BLAKE2B 000bf6b0300b7f3a2efce548b433e7a84a15a24768a499c5537dbec412ddd2f4a62a4bffcead143f9f4ce7b4819fc93b663ee6fb4907357a4ddd71761aca49dc SHA512 a5ccab5861d9fb4152e366160cd73a674e2b29f9f72526b42874324860fe5083091aad95fd02682e4287a3798b0865d9733ee3e7825d0dec21836446c2995a67
 MISC metadata.xml 495 BLAKE2B f6dcdfdea078816191c90910089dd90c242b7aa90e41b07670f7bd024d24cdf4a19ab8486c2e82acd4da6bf26db2fc0dcd087b959d8e188d1be1a17ce6b98976 SHA512 bde612118e9e962e7dbd04340312b9556fa54d241831c0e754e10e65f0eccd4909b19622d4f393e684e688977ac34db30e7fa16848116fa39c5aac95f669f2ba
diff --git a/dev-ruby/rack-protection/rack-protection-3.0.5.ebuild b/dev-ruby/rack-protection/rack-protection-3.0.5.ebuild
index 31bb18448cc9..be284c2c4bc2 100644
--- a/dev-ruby/rack-protection/rack-protection-3.0.5.ebuild
+++ b/dev-ruby/rack-protection/rack-protection-3.0.5.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby27 ruby30 ruby31"
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
 
 # There are no specs in the gem and the source cannot be downloaded separately.
 RUBY_FAKEGEM_RECIPE_TEST="none"
diff --git a/dev-ruby/railties/Manifest b/dev-ruby/railties/Manifest
index 241af5beeb94..0e8130f7937c 100644
--- a/dev-ruby/railties/Manifest
+++ b/dev-ruby/railties/Manifest
@@ -14,6 +14,7 @@ EBUILD railties-6.1.7.2.ebuild 1625 BLAKE2B 6a5b3cb78bf686f0e8b6397d0aa60e1fd1e8
 EBUILD railties-6.1.7.3.ebuild 1625 BLAKE2B 6a5b3cb78bf686f0e8b6397d0aa60e1fd1e8d749ed8b70653cc311288caab014071a615c9184f38debaeab1d456a5f2fbf7f7c5125eb0d31d94a4fcb4d875780 SHA512 c2e3cb02a5b1df7eb335a8fb852fbabe94383d3b7892ab18aea8adca97e586fbd67afc89a5ec66b200a3bc0506ae04ecd23d5f855fd9f10865f49b2581f7d1f0
 EBUILD railties-6.1.7.ebuild 1625 BLAKE2B 206330aeccd482d3bd6f6bb86848cd682b54bbd545535c16cee31fd7ec8d23260f6e41c6fca2f76e9a4ed7be4895142dfab2ea4094d497b428c77c0b58a2ca19 SHA512 051bd726af1da8e6e636bc51be4c22094546f28b1221f8596100cbbdffb7b37929bc560dcb657079cf7d709aaf21bfadb205b0e844a413aae06145e2deafd146
 EBUILD railties-7.0.4.2.ebuild 1640 BLAKE2B db7e8b71f17ba006e3852c35ea70b7522b58f9493629e6d8837f80c5ae725deeaf4b73281e740babfad82d58004dc7f2daae7c5c27472be7107380a8f8fdbe68 SHA512 26714ed64c242be9baa0bb0f5f24affcc3607f66000c0ab1c83352f0d9e99df6018bf7b22505b23104995576b09b934f53e471d0ecfd7fb23340ad940e405753
+EBUILD railties-7.0.4.3-r1.ebuild 1645 BLAKE2B cb68d79c2fcdecc8be3803775ec623f4d8874b86acd0bb0e3a557c60e17e6baa669b32482c92dfd26f90e6d6f34d887b78986c068d9ec8a505b83ab8fa051856 SHA512 fc3843054d2db42eb390cde33d5a804898b0cb382d948e60ae7a3ff6a446a0653f38dbc48b52b4e7c479444887ab11a90bbd04453d2a5a1ab89a5a991e80748c
 EBUILD railties-7.0.4.3.ebuild 1651 BLAKE2B 370ccd4eda063ac693aa4f20f101385ffca79aea4b09054cdfc16bcf7119b6d37ac23b35993e299ed2812ae79d795f0bcef0df4b945959b448581c4cd19715a7 SHA512 19b6cf09219653e80203b4eaa253a7d9a49e5accb1d2b3cf71cb450059bd082913d0dfca4c956e513d2736542a6c2c733a8a89d848fefac873b6401869075078
 EBUILD railties-7.0.4.ebuild 1640 BLAKE2B db7e8b71f17ba006e3852c35ea70b7522b58f9493629e6d8837f80c5ae725deeaf4b73281e740babfad82d58004dc7f2daae7c5c27472be7107380a8f8fdbe68 SHA512 26714ed64c242be9baa0bb0f5f24affcc3607f66000c0ab1c83352f0d9e99df6018bf7b22505b23104995576b09b934f53e471d0ecfd7fb23340ad940e405753
 MISC metadata.xml 338 BLAKE2B f32f1ecbd729e4e6162f22cdb9bfe1fbb1284c8b7f021d8207a1a54d2543b0e9866e775d550360dd01ef4f4eb92e96064a8416476c7047853034ea05479eb6e7 SHA512 24fd0d8ea6e3cd5514e5049b7e064b7e3e667ea14978cc7cf620e9c1b020bdc7caf7dbec97ccbf92c2f4c657fff3e9151d6f2af103b3d9c3cc5181cb3a81a295
diff --git a/dev-ruby/railties/railties-7.0.4.3-r1.ebuild b/dev-ruby/railties/railties-7.0.4.3-r1.ebuild
new file mode 100644
index 000000000000..492588faa3d8
--- /dev/null
+++ b/dev-ruby/railties/railties-7.0.4.3-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_TASK_TEST="test:regular"
+RUBY_FAKEGEM_RECIPE_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="railties.gemspec"
+
+RUBY_FAKEGEM_BINDIR="exe"
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Tools for creating, working with, and running Rails applications"
+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 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RUBY_S="rails-${PV}/${PN}"
+
+# The test suite has many failures, most likely due to a mismatch in
+# exact dependencies or environment specifics. Needs further
+# investigation.
+RESTRICT="test"
+
+RDEPEND+=">=app-eselect/eselect-rails-0.25"
+
+ruby_add_rdepend "
+	~dev-ruby/activesupport-${PV}
+	~dev-ruby/actionpack-${PV}
+	dev-ruby/thor:1
+	>=dev-ruby/rake-12.2
+	dev-ruby/method_source
+	>=dev-ruby/zeitwerk-2.5:2
+"
+
+ruby_add_bdepend "
+	test? (
+		~dev-ruby/actionview-${PV}
+		dev-ruby/mocha:0.14
+	)"
+
+all_ruby_prepare() {
+	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
+	sed -i -e '/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
+	sed -i -e '1igem "minitest", "~>4.0"' test/abstract_unit.rb || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	ruby_fakegem_binwrapper rails rails-${PV}
+}
+
+pkg_postinst() {
+	elog "To select between slots of rails, use:"
+	elog "\teselect rails"
+
+	eselect rails update
+}
+
+pkg_postrm() {
+	eselect rails update
+}
diff --git a/dev-ruby/sass/Manifest b/dev-ruby/sass/Manifest
index a5ca79d06622..eb23e634f1d2 100644
--- a/dev-ruby/sass/Manifest
+++ b/dev-ruby/sass/Manifest
@@ -1,3 +1,5 @@
+AUX sass-3.7.4-use-listen-not-sass-listen.patch 479 BLAKE2B 8ce894c58bf4529cf2aaea3a5e247731ae1a56afafec17f7dd2df6e35d7de0ff9330d4fe2bb088fd3dbcbad3503c20afc65242228da0db4c81de356aa8a999dd SHA512 9dbad64cc59515806439ce5528875e258c2b5731d58a47db2c991e7d4e6e0e9e9bdad654abb435f64b3c9b075979f9e3d89266a8aa4ae817252ab3402f3d3b7e
 DIST sass-3.7.4.tar.gz 401442 BLAKE2B 52abe37390282d2aead3eea6c2a049da529a5e96bac44b01ccded1e3c4d2c332d82f164da941413c0138fd3a94f59cda084d8fb724db87fc522f33dd7bc31adb SHA512 4bebb6ddc84e7f2687d9b801e6b30e897d83a46940249349d775e0139d1fca8ffd96d0976f4c35a7a0dba9ebf786883a70aff2ff002708e28b685a034634aaf2
 EBUILD sass-3.7.4-r1.ebuild 1177 BLAKE2B 038199a06bba439eac0f11df3bc5dfdb56b8c42dfcaa78b23189427afcf869149515635a6de548290290a4311bdde06c4f289118149ff0f7764a8708418b716a SHA512 67771fd0972fd328504f2bab9a95433b8310bece1a076c29366a2b3371ccf13cc2615b0d822404d85eb0924c6894d44d7d3e5c01933dc99d5ef82a1e3b42a7d8
+EBUILD sass-3.7.4-r2.ebuild 1666 BLAKE2B 4bd5790bd19c523fbbc2f2a76dcc8c48b9fc7ab9204ab83fc7b08d18c97792aa46a0dff96456d5ae0775b7231bc3895c3a9d305e155fbe0f1a8d814f1748bbc4 SHA512 556277e4c305947e0b512a84510bde7bbca420e933847e9f5ba49804755f56ea4f75910e1e62882bdca02f0e0892c90cb2e4c15e7f82949f6ed0801d1e359806
 MISC metadata.xml 324 BLAKE2B d12b9c73747bb4ab333b3bbe381d713c78d12bc5ea5c526a17744ac10a81a1cfc0dbb5b74bd507fb9bdd9ff7f180aaa24affb16cc9fc18463030749c8ce3e078 SHA512 fd1ffcf3514360716ad7fc513010f5da118896fe99d0949d8249e072ca8b554ff7ddea9bb4cb79e8a71e7eb963ae39943b613260166d6f56d18120c9283f22e5
diff --git a/dev-ruby/sass/files/sass-3.7.4-use-listen-not-sass-listen.patch b/dev-ruby/sass/files/sass-3.7.4-use-listen-not-sass-listen.patch
new file mode 100644
index 000000000000..17d2aa9217c2
--- /dev/null
+++ b/dev-ruby/sass/files/sass-3.7.4-use-listen-not-sass-listen.patch
@@ -0,0 +1,14 @@
+https://src.fedoraproject.org/rpms/rubygem-sass/blob/rawhide/f/rubygem-sass-3.5.6-use-listen.patch
+--- a/lib/sass/plugin/compiler.rb
++++ b/lib/sass/plugin/compiler.rb
+@@ -377,8 +377,8 @@ module Sass::Plugin
+ 
+     # This is mocked out in compiler_test.rb.
+     def create_listener(*args, &block)
+-      require 'sass-listen'
+-      SassListen.to(*args, &block)
++      require 'listen'
++      Listen.to(*args, &block)
+     end
+ 
+     def remove_redundant_directories(directories)
diff --git a/dev-ruby/sass/sass-3.7.4-r2.ebuild b/dev-ruby/sass/sass-3.7.4-r2.ebuild
new file mode 100644
index 000000000000..43ee9a37a950
--- /dev/null
+++ b/dev-ruby/sass/sass-3.7.4-r2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_EXTRAINSTALL="rails init.rb VERSION VERSION_NAME"
+
+inherit ruby-fakegem
+
+DESCRIPTION="An extension of CSS3, adding nested rules, variables, mixins, and more"
+HOMEPAGE="https://sass-lang.com/"
+SRC_URI="https://github.com/sass/ruby-sass/archive/${PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="ruby-sass-${PV}"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux"
+
+ruby_add_bdepend "doc? ( >=dev-ruby/yard-0.5.3 )"
+
+ruby_add_rdepend "
+	!!<dev-ruby/sass-3.4.25-r1:3.4
+	!!<dev-ruby/sass-3.5.7-r1:3.5
+	dev-ruby/listen
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.7.4-use-listen-not-sass-listen.patch
+)
+
+# tests could use `less` if we had it
+
+all_ruby_prepare() {
+	# Match activesupport which gets dragged in
+	sed -i -e '/minitest.*>= 5/s:.*:&, "< 5.16":' ${PN}.gemspec || die
+	sed -i -e '/minitest/s:6.0:5.16:' Gemfile || die
+	sed -i -e "/require 'minitest\/autorun'/igem 'minitest', '< 5.16'" test/test_helper.rb || die
+
+	# We use dev-ruby/listen now instead of dev-ruby/sass-listen
+	sed -i \
+		-e "/sass-listen/s:, '~> 4.0.0'::" \
+		-e "s:sass-listen:listen:" \
+		${PN}.gemspec || die
+
+	# Don't require maruku as markdown provider but let yard decide.
+	sed -i -e '/maruku/d' .yardopts || die
+
+	# Keep VERSION_DATE around since we don't create a new package
+	sed -i -e '/at_exit/,/end/ s:^:#:' Rakefile || die
+}
+
+each_ruby_test() {
+	RUBOCOP=false ${RUBY} -S rake test:ruby || die
+}
diff --git a/dev-ruby/selenium-webdriver/Manifest b/dev-ruby/selenium-webdriver/Manifest
index ae7cb27562a7..4f1bf0295d6a 100644
--- a/dev-ruby/selenium-webdriver/Manifest
+++ b/dev-ruby/selenium-webdriver/Manifest
@@ -1,5 +1,5 @@
 DIST selenium-webdriver-4.0.3.gem 152576 BLAKE2B 671909863bbbe328bbaf30a9e3c9e459e9eb6b892f554729892327230c03dd03f7819d9e8beb901cea986cb0d97877ce49853de856e1f802369686a03e5e9086 SHA512 260ad111ef9c512835f410fc7283df90b245d42db12274028148575e0a89a8c71639f0132a621f326921317b3181564521d9e801f2a7f14e5f196cde2550773c
 DIST selenium-webdriver-4.1.0.gem 153088 BLAKE2B f437b5e6c19b9a2b7d0393646b11bcaa0808fb9981c847ca0d86bd55ef04fc109d439eb0f41fce543ea121fde096fe3e72c56d1db861b6554f673a3de07bdff8 SHA512 9760c6a96dbef25f558216986a9cedcb00fe19313273ea5c3a4866d5afae327fbe3895e3e2ee405714f8a9410c290b0e51352b68465cb0df9ff31b6d2749b174
 EBUILD selenium-webdriver-4.0.3.ebuild 1015 BLAKE2B df6b7d93c12ab49c58fd76b561597beac3452d7e41075a04fac82ac1282e43846924232015f73506ddd6c11856cca27fee8eb8e51f4587dc19f8eeb4ae941207 SHA512 2a272f961e101c996dcc4b7cacbac94dc5257e95fa6d07ac9fd4f6815273873a376482b09079dbaedbcf50e5cfd6bc59c75c2a35fe152ceffdebf6daa1cbae5b
-EBUILD selenium-webdriver-4.1.0.ebuild 1034 BLAKE2B 9ac98dd6c40d60f070a498f3d8935f0340c35efde2a38be5fd42f9c44842a790d36dd5ed410436edc9d749af7b18305c08a3ccf14ce9c42c6d4ef8c684e13c52 SHA512 3eb6d4cad653463b160b801d726e3fd9cbbbe5463134c4664fe1122e59320986136603fa60f66ffc357fca1a381a691d0bd9677c427b159316396845dd7d7a4d
+EBUILD selenium-webdriver-4.1.0.ebuild 1034 BLAKE2B 4776ec4712de2a9f88a60d4ff5a2a28fb9dd827608e7a104265db10127cb87930eef8d4abe3d32f237635624a9ed5466ca3c0ad4d340c39b35589cb7a32c4fb0 SHA512 b8f50821c4825ba882a220aafaec756f23a28ca8fd0f5a982121a9912f5b56f24c4d8d6bba183977ac4556c35843d7f32c934b47033d8817f26280d2cb079727
 MISC metadata.xml 336 BLAKE2B 2133927d6a27b7422141ed649e46efc069300160b5fecb9fb5bdbf575461fde2b12411696be46cc673d6996c8711f50a46e92e1cdda5ff1f7c57ae298ff76406 SHA512 d1f80b8bf35f2fd08e4689292ce535ece939a64b94123780206d4ee3ab7a20b6d9c3a2d9f5248eaa2d0d35bb32bc5707e14c09b60881d856a180435b8f656bea
diff --git a/dev-ruby/selenium-webdriver/selenium-webdriver-4.1.0.ebuild b/dev-ruby/selenium-webdriver/selenium-webdriver-4.1.0.ebuild
index 938aace196e4..29944400ea25 100644
--- a/dev-ruby/selenium-webdriver/selenium-webdriver-4.1.0.ebuild
+++ b/dev-ruby/selenium-webdriver/selenium-webdriver-4.1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
 
 # NOTE: this package contains precompiled code. It appears that all
 # source code can be found at https://code.google.com/p/selenium/ but the
diff --git a/dev-ruby/sinatra/Manifest b/dev-ruby/sinatra/Manifest
index 4fc19d0e3f2c..4a7295af1819 100644
--- a/dev-ruby/sinatra/Manifest
+++ b/dev-ruby/sinatra/Manifest
@@ -5,5 +5,6 @@ DIST sinatra-3.0.5.tar.gz 266205 BLAKE2B 16e0631ed49e62610c7bc1e43f03f21f57ee968
 EBUILD sinatra-2.2.3.ebuild 1169 BLAKE2B 945caba2ba540c84ce59ca0394ecefd9593017f8e638a4b5569db6b949cac5d27b28fff3d3938b80ae8e8ec15fbcafe49d51499c52e57ced4ca56bcc1cbaeafc SHA512 2597953c54e9550cc5574b5a64ee1918b8aea67d07e380886800d93efe06455daf5ddee033cebd350f07599d16c27c7a0d8a2092fcd1277009876df8bef47d68
 EBUILD sinatra-3.0.2.ebuild 1032 BLAKE2B a318d2bb27f201493c9b1b07d741af8f97ad03c6bea074cfc99946f89fb8513770ef3f584beff328767723b954e4f657c5ae64541ebab365fe322e7bba0c78e5 SHA512 43124a035900095395901af2c0e1766987401eaba394e56c8e830214ff7fd3469f1b5f4bc3a1bd0cdc01a03889b6a57b2837aca1db43a5a8fd4dea42c12e480c
 EBUILD sinatra-3.0.4.ebuild 1032 BLAKE2B a318d2bb27f201493c9b1b07d741af8f97ad03c6bea074cfc99946f89fb8513770ef3f584beff328767723b954e4f657c5ae64541ebab365fe322e7bba0c78e5 SHA512 43124a035900095395901af2c0e1766987401eaba394e56c8e830214ff7fd3469f1b5f4bc3a1bd0cdc01a03889b6a57b2837aca1db43a5a8fd4dea42c12e480c
+EBUILD sinatra-3.0.5-r1.ebuild 1399 BLAKE2B dac6495bdc964f72e9d7db7c998a25c39ad956ccb80ea175c7712c0fc73fbd6128a641b2f093beaf999c45c21c19874a2fb7f9635167fe18f25ee4fefd935f4f SHA512 123f99cc67ef072adb36b22b03d4ae1bd194efac1cab437ce966cb1927d8d4a46f94194100e8d93a893048f37eba2b34ebdce385e59e8c42d5ab8e7056a26896
 EBUILD sinatra-3.0.5.ebuild 1163 BLAKE2B 3d76cea60668d9c5f458fd20b5abf3f5121f3f9547d6d84d3d3ea6fb62ae6fcf6ab0097e86ce2175d298547cd403be261cf703251186b84db0e908a33919fb6f SHA512 d6d03d8bdd36af7b4cc8d38997d56359813d17dc84157a51636fdb7d929dce93f938bbd752fd85709a03de662fefcb95527a1e0a154637b9ab27970389d3150c
 MISC metadata.xml 393 BLAKE2B 730e333a7e2203f0219040e53c2ddd3a894af807a242e62df1fdb94a2eee0350c52348a55699c80d4674f0b6024875627f68e2061b740dced0e2ebd2155e5b38 SHA512 fd922f80dcd2c7c663506680f9b6d86f810c68d1c6f81480063d3c20aa561a972f0fe837dbc636848191092c7b599d7e330ffe296e41c0da6f46dba68d2cea7c
diff --git a/dev-ruby/sinatra/sinatra-3.0.5-r1.ebuild b/dev-ruby/sinatra/sinatra-3.0.5-r1.ebuild
new file mode 100644
index 000000000000..d58ccd568438
--- /dev/null
+++ b/dev-ruby/sinatra/sinatra-3.0.5-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_TASK_TEST="MT_NO_PLUGINS=true test:core"
+
+RUBY_FAKEGEM_EXTRADOC="README.md AUTHORS.md CHANGELOG.md"
+
+RUBY_FAKEGEM_GEMSPEC="sinatra.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A DSL for quickly creating web applications in Ruby with minimal effort"
+HOMEPAGE="https://sinatrarb.com/"
+SRC_URI="https://github.com/sinatra/sinatra/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+ruby_add_rdepend "
+	dev-ruby/mustermann:3
+	>=dev-ruby/rack-2.2.4:2.2
+	~dev-ruby/rack-protection-${PV}
+	dev-ruby/tilt:2"
+ruby_add_bdepend "
+	test? (
+		dev-ruby/builder
+		dev-ruby/erubi
+		dev-ruby/haml
+		>=dev-ruby/rack-test-0.5.6
+		<dev-ruby/activesupport-7
+	)
+"
+ruby_add_bdepend "doc? ( dev-ruby/yard )"
+
+all_ruby_prepare() {
+	# Matching dev-ruby/activesupport
+	sed -i -e '/minitest.*~> 5.0/s:.*:&, "< 5.16":' Gemfile || die
+
+	sed -i \
+		-e "/require 'rack'/igem 'rack', '~> 2.2', '>= 2.2.4'" \
+		-e "/require 'minitest'/igem 'minitest', '< 5.16'" \
+		-e '/active_support\/core_ext\/hash/igem "activesupport", "<7"' \
+		test/helper.rb || die
+
+	# Avoid spec broken by newer rack versions, already removed upstream.
+	sed -i -e 's/"bytes=IV-LXVI", //' test/static_test.rb || die
+}
diff --git a/dev-ruby/sprockets-rails/Manifest b/dev-ruby/sprockets-rails/Manifest
index 7da545c59d0c..1ad274548d5e 100644
--- a/dev-ruby/sprockets-rails/Manifest
+++ b/dev-ruby/sprockets-rails/Manifest
@@ -1,3 +1,4 @@
 DIST sprockets-rails-3.4.2.tar.gz 111038 BLAKE2B 36495540d8756bd44ba55ed0bf055c35ed963e1d5a8214766f61ff86515285babd409f44816bd9dae8321dd5473f7f5515d2c1c5ffa6b6042788ee50b4bfd247 SHA512 a01a23b189bc0fcde8fa3a0734c239dc9ee9119ca7a0828f04974cc28344e6c5743a6f60f1ab8ae8ed28c0e111103948209593ccd88dc974e2d12b55a1a2b49a
 EBUILD sprockets-rails-3.4.2-r1.ebuild 948 BLAKE2B 86a7bb9fff7521fbe6983501690570087af77ec649ce58ec98bcd816eeef1d21162da09341cc4ad685795dc108ffaeb9f51cd887eab7b7b9d7fc828c43aabd3b SHA512 12854f9be622c0f65d0270cd102ea7905221c2306e4d989443a25990ed53ceadacb61e9cceaf1968a4c8ac8f5f03cad35d27f29a9fc07ed9a39bb083cf9e3541
+EBUILD sprockets-rails-3.4.2-r2.ebuild 1054 BLAKE2B fc48990bfb3a94f8950ea86661cf1a1322da487edebfb1b84cdbce637a88e923fd97bf9189da820978eaeeef33ecd2dfe9c3a2d8a13e63e81d7feae40fb91a31 SHA512 b5284f5dd8f3ae18a022bbd7b014f83a35394a5a16fcc54c99bcdf18974a87a3449eb5736dace14e51e7c6741dc3010006425ae2899a335a2ba8fc2740ac86b9
 MISC metadata.xml 348 BLAKE2B 0682ae79b86466b0908cd13f3eed20718fa6d3ab12a65579666242049ff37e58d57ec2f40bb3fc67a6ea441cea091542d2afdc35b5f3819b7925cd95420e5536 SHA512 1789cac2bf0b961b771f12135bf77769aa20cd019178c782105a1798107bb944e5aa8f8f54c13feecdf89f0461b307be09ad5b7a87c53b9b93fb5dbd3f0381ed
diff --git a/dev-ruby/sprockets-rails/sprockets-rails-3.4.2-r2.ebuild b/dev-ruby/sprockets-rails/sprockets-rails-3.4.2-r2.ebuild
new file mode 100644
index 000000000000..242ef49f69eb
--- /dev/null
+++ b/dev-ruby/sprockets-rails/sprockets-rails-3.4.2-r2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Sprockets implementation for Rails 4.x (and beyond) Asset Pipeline"
+HOMEPAGE="https://github.com/rails/sprockets-rails"
+SRC_URI="https://github.com/rails/sprockets-rails/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux"
+
+IUSE="test"
+
+ruby_add_rdepend "
+	>=dev-ruby/actionpack-5.2:*
+	>=dev-ruby/activesupport-5.2:*
+	>=dev-ruby/sprockets-3.0.0:*"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/minitest:5.15
+		>=dev-ruby/railties-5.2:*
+		dev-ruby/test-unit:2
+	)"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/ s:^:#:' Rakefile || die
+
+	# Match activesupport
+	sed -i -e "1igem 'minitest', '< 5.16'" test/*.rb || die
+
+	# It looks like tests are order dependent
+	sed -i -e '/test_order/ s/:random/:alpha/' test/test_helper.rb || die
+}
diff --git a/dev-ruby/sprockets/Manifest b/dev-ruby/sprockets/Manifest
index 27ada314623e..63214b9c65b2 100644
--- a/dev-ruby/sprockets/Manifest
+++ b/dev-ruby/sprockets/Manifest
@@ -11,5 +11,5 @@ EBUILD sprockets-3.7.2-r3.ebuild 1778 BLAKE2B d9d86036d950e27d1b1edb85c170de7f60
 EBUILD sprockets-4.0.2.ebuild 2073 BLAKE2B 83ca1f1c975ec2f0e84dbdd3b988da08f767ae7773989fc0bed64c75c95e9b8f8dd6ac2f32c53da642b50f1c74bd16d2297e7c9e1622cb33d9e70f1eb872d546 SHA512 934e726b1b3711301bdbe0783d87239965270371b0f80fa910b7483fac24829faf98880b1ef1e205371127e7e629495240f243cba2ee77774cec364063ed5f1f
 EBUILD sprockets-4.1.0.ebuild 2090 BLAKE2B cc6c680b76936346259b71f6d06478dfb242f49a90156f7e9836e4115f27d3c715676d8d8cb93c937f8d0b4d3b1095b75e2d652acb479205671d45d4c0678d2a SHA512 b1892932bdcfd23820bf43bcb269684f89c906fb17883baf27ae4178f8a5d48dbef3abf2685328b3ef156c0613daf30867279dc2c1a068f73e3066b70d87110b
 EBUILD sprockets-4.1.1.ebuild 2090 BLAKE2B c0130e4d7b4b2c476189fd0970485cc416a52776ecbe0e18b1a98c6a3e1b721031c4f1dcd6a491c1520894ea46e3cb9c5cd5bb1f36982e6ed477a86901ea4cc0 SHA512 6aae3a8175e999770ef3ce619b60d5aa2213658b74238f2916980eef3ddff6a0aeb99328d5e97ed25a8ec1327d8901ec48a311ccdf65a0f0fe5c172da3132c44
-EBUILD sprockets-4.2.0.ebuild 2045 BLAKE2B cbd12d02984f241323c86b6f4b2d9f6ec2f7c78c29fe975a707e651ab709dd08607419a2ba8923719f9e5fd8c5ce8b8a4856e0bb6b949b4ac706da81f56d0aeb SHA512 e243144c37bf503c99510d303bf5ea1c9f4cbbc1a878f80f1c5e2287c31be7e466f2ebf4556637d5d85e05b58a9a22d1e615f183aefd7f2245ac69be1bc86aea
+EBUILD sprockets-4.2.0-r1.ebuild 2052 BLAKE2B ae631d148791edc52b382fe8a85161b40a3b21d8884f4ffe4fc8796273b86521f0165b0ed3ac117f2c325832d22307243bff36783efb1326eb42dcee8307807a SHA512 d1995d8570f01560ac33c590c17049d9b66d89b7fa159fa175ff516533eaf33539e04b50cbbaf49eea781416b070002237ac80dd1886e5acdb4d8af4704c18ed
 MISC metadata.xml 342 BLAKE2B 227ac77350fe458144d05c09bef5156a9f7c06154b8aba9902f1611b7f3e22b5409231cfb0a44af0d6f5d87138a0d71eb230d8827773830b508d91848f5a8cb0 SHA512 ee0cc0cfbfed5e9e61386b885714cf26a3ca1e2e94b820859ea1b08f82fe3ab5bf13c5a4764dd2b4ca48d668f22e493d76a39cb48a8d3c784b55b78cbfc02ec3
diff --git a/dev-ruby/sprockets/sprockets-4.2.0.ebuild b/dev-ruby/sprockets/sprockets-4.2.0-r1.ebuild
index 5462145cfa71..1842bcdda122 100644
--- a/dev-ruby/sprockets/sprockets-4.2.0.ebuild
+++ b/dev-ruby/sprockets/sprockets-4.2.0-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="ruby27 ruby30 ruby31"
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
 
 RUBY_FAKEGEM_EXTRADOC="README.md"
 
@@ -22,7 +22,7 @@ IUSE=""
 
 ruby_add_rdepend "
 	dev-ruby/concurrent-ruby:1
-	>=dev-ruby/rack-2.2.4:2.2
+	>=dev-ruby/rack-2.2.4:3.0
 "
 
 ruby_add_bdepend "test? (
diff --git a/dev-ruby/webrick/Manifest b/dev-ruby/webrick/Manifest
index a3f486fe9b30..f951b05570f9 100644
--- a/dev-ruby/webrick/Manifest
+++ b/dev-ruby/webrick/Manifest
@@ -3,5 +3,5 @@ DIST webrick-1.8.0.tar.gz 91072 BLAKE2B 9275458772048d68d5275e19e6c1e2c13bbedaf7
 DIST webrick-1.8.1.tar.gz 91111 BLAKE2B eff3f2dff64d017fa0ef5370b07d97bfcd39f1df426a3b04ffdd0b5b0ea43cdd5d267420ea64bd0c3e4de3f1ee88df2f09959fd17b2b158b5ce0ddc16995b2bb SHA512 21cb396887025f85cfe04868e7fa7ef039809ca42a3acadfe1decb4dcd02eeeb3c9163e970324b56a9e0eb6202d971370af56e200c69de2d224c1941f866400c
 EBUILD webrick-1.7.0-r1.ebuild 755 BLAKE2B 5f5ab7c1397e6863196d340e5794faf6872a42199fcf2833396f771c9a2c6150869fc8fdee375a3deb6659cc4e5c7e9deb1f6e1145025f60b81f96b9970ca981 SHA512 966915017e6c11a969d9dab2c2344d6521d330612feac7f0239aec2b86401fa484d374f628a82db9350a4487080cf379ba2580ffd8b984c16701473bf2343ea2
 EBUILD webrick-1.8.0.ebuild 755 BLAKE2B 8967221d6456624f5483e6fc1f721e2d0a8e9fd5d5c210e2b3bd2dd6624c2dbc4512eb86aac12fbdc678b958c14b2e794bc9f3c9d2cb0006656c5d01596972d6 SHA512 72ade795dd57f4ce2e106b5a41c97db1f82c9f87162f208d7c26002ec0a3a301abb428004a6fea01822d55afc5c2dcfc6f80d9093832149128f750cdefdc5539
-EBUILD webrick-1.8.1.ebuild 763 BLAKE2B 970fb1639e78f4cbec150e415f4cc8b1ff1ab44ebce4ab61c04c795d4159aee6aa23dbc1f8898dd823ab5214f4b7cb8291d379f964ff9900dd701e566d2a9a22 SHA512 c479eaf7f4d7c7b3edef61315781e7929035d215ce6e6273f76967df87f5897ed3c33656c1664330e64b1cc250ac960cb2c47ac6f8a0a9860cad189af03a1869
+EBUILD webrick-1.8.1.ebuild 901 BLAKE2B 8099c3db3dfa9ed115e0f86a48d32869d1c8c45ab187948d5bc288e28fb6804f71315ee63802c47e820475cae7158c3baef2cef17e9fc47977ed227b2b46f30b SHA512 204dd2695584f141e53453b8f67bfc0dbb09b738b6b2b3ee6199aa1872ae4cfea77d901386307c86adcc116a2d7635ed0f664dd08fd3d228293c1fc161b062d6
 MISC metadata.xml 339 BLAKE2B 818ee09423c4ed53677cff830ae592234879035757260fa554871e0180d47780056eb8c301678428928a841638059507ea2b170abd758f8c73546fcabd675b49 SHA512 4abab733deab5e4609430f0d51f7634fda1879be7694720e683b0d9972691f41dbfe7fe9e7d252cddb9ac5a449bdf521b0d3b10acdf510e02c3b3a8bad578b71
diff --git a/dev-ruby/webrick/webrick-1.8.1.ebuild b/dev-ruby/webrick/webrick-1.8.1.ebuild
index a1f3c05c2cd5..e227637cab0b 100644
--- a/dev-ruby/webrick/webrick-1.8.1.ebuild
+++ b/dev-ruby/webrick/webrick-1.8.1.ebuild
@@ -15,10 +15,13 @@ HOMEPAGE="https://github.com/ruby/webrick"
 SRC_URI="https://github.com/ruby/webrick/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE="test"
 
 all_ruby_prepare() {
 	sed -i -e "s:_relative ': './:" ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Increase timeout for test to help out slow arches
+	sed -i -e '/EnvUtil.timeout(10) do/s:10:60:' test/webrick/test_ssl_server.rb || die
 }